OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

remove-scene-viewer
Melanie 2011-11-06 20:00:47 +00:00
parent 0bf757e42b 927561383e
commit fa992a020c
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3164,16 +3164,25 @@ namespace OpenSim.Region.Framework.Scenes
public void SendKillObject(uint localID)
{
SceneObjectPart part = GetSceneObjectPart(localID);
UUID attachedAvatar = UUID.Zero;
if (part != null) // It is a prim
{
if (!part.ParentGroup.IsDeleted) // Valid
{
if (part.ParentGroup.RootPart != part) // Child part
return;
if (part.ParentGroup.IsAttachment && part.ParentGroup.AttachmentPoint >= 31 && part.ParentGroup.AttachmentPoint <= 38)
attachedAvatar = part.ParentGroup.AttachedAvatar;
}
}
ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
ForEachClient(delegate(IClientAPI client)
{
if (attachedAvatar == UUID.Zero || attachedAvatar == client.AgentId)
client.SendKillObject(m_regionHandle, localID);
});
}
#endregion

10
OpenSim/Services/AssetService/AssetService.cs
View File

@ -117,7 +117,15 @@ namespace OpenSim.Services.AssetService
return null;
}
return m_Database.GetAsset(assetID);
try
{
return m_Database.GetAsset(assetID);
}
catch (Exception e)
{
m_log.ErrorFormat("[ASSET SERVICE]: Exception getting asset {0} {1}", assetID, e);
return null;
}
}
public virtual AssetBase GetCached(string id)