ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of bugs with Appearance. Appearance is all good now.

Browse Source
This commit is contained in:
Diva Canto
2010-01-11 17:30:05 -08:00
parent 4e7c449c5a
commit 77e43f4801
16 changed files with 124 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -2358,7 +2358,7 @@ namespace OpenSim.Region.Framework.Scenes
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = InventoryService.GetItem(item);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
}
return att.UUID;
}
@@ -2403,7 +2403,7 @@ namespace OpenSim.Region.Framework.Scenes
// XXYY!!
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = InventoryService.GetItem(item);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
if (m_AvatarFactory != null)
{

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
get
{
if (m_AvatarService == null)
m_AvatarService = RequestModuleInterface<OpenSim.Services.Interfaces.IAvatarService>();
m_AvatarService = RequestModuleInterface<IAvatarService>();
return m_AvatarService;
}
}

4
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@@ -250,7 +250,7 @@ namespace OpenSim.Region.Framework.Scenes
{
InformClientOfNeighbourDelegate icon = (InformClientOfNeighbourDelegate) iar.AsyncState;
icon.EndInvoke(iar);
m_log.WarnFormat(" --> InformClientOfNeighbourCompleted");
//m_log.WarnFormat(" --> InformClientOfNeighbourCompleted");
}
/// <summary>
@@ -456,7 +456,7 @@ namespace OpenSim.Region.Framework.Scenes
int count = 0;
foreach (GridRegion neighbour in neighbours)
{
m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
//m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
// Don't do it if there's already an agent in that region
if (newRegions.Contains(neighbour.RegionHandle))
newAgent = true;

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -2565,14 +2565,18 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
}
#endregion Bake Cache Check
m_appearance.SetAppearance(textureEntry, visualParams);
if (m_appearance.AvatarHeight > 0)
SetHeight(m_appearance.AvatarHeight);
AvatarData adata = new AvatarData(m_appearance);
m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
SendAppearanceToAllOtherAgents();