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

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -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

OpenSim/Services/AssetService/AssetService.cs

@@ -117,8 +117,16 @@ namespace OpenSim.Services.AssetService
                 return null;
             }
 
+            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)
         {