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

Merge branch 'master' into vehicles

Browse Source
This commit is contained in:
Melanie
2009-10-15 21:16:05 +01:00
parent 6deef7d0f3 9ddf598e54
commit 642084c2a9
7 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2402,11 +2402,11 @@ 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*/);
IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
if (ava != null)
if (m_AvatarFactory != null)
{
m_log.InfoFormat("[SCENE INVENTORY]: Saving avatar attachment. AgentID:{0} ItemID:{1} AttachmentPoint:{2}", remoteClient.AgentId, itemID, AttachmentPt);
ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
}
}
}

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

@@ -2481,7 +2481,7 @@ namespace OpenSim.Region.Framework.Scenes
if (aCircuit == null || aCircuit.child == false)
{
sp.IsChildAgent = false;
sp.RezAttachments();
Util.FireAndForget(delegate(object o) { sp.RezAttachments(); });
}
}

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

@@ -2507,8 +2507,9 @@ namespace OpenSim.Region.Framework.Scenes
List<ScenePresence> avatars = m_scene.GetAvatars();
for (int i = 0; i < avatars.Count; i++)
{
if (avatars[i] != this)
{
// Requested by LibOMV. Send Course Location on self.
//if (avatars[i] != this)
//{
if (avatars[i].ParentID != 0)
{
// sitting avatar
@@ -2530,7 +2531,7 @@ namespace OpenSim.Region.Framework.Scenes
CoarseLocations.Add(avatars[i].m_pos);
AvatarUUIDs.Add(avatars[i].UUID);
}
}
//}
}
m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations);
@@ -3841,6 +3842,9 @@ namespace OpenSim.Region.Framework.Scenes
List<int> attPoints = m_appearance.GetAttachedPoints();
foreach (int p in attPoints)
{
if (m_isDeleted)
return;
UUID itemID = m_appearance.GetAttachedItem(p);
UUID assetID = m_appearance.GetAttachedAsset(p);
@@ -3866,9 +3870,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}", e.ToString());
}
}
}
}
}