1 files changed, 11 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 96b8c8b..ae827f4 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1604,13 +1604,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         protected internal void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
         {
-            SceneObjectGroup group = GetGroupByPrim(localID);
+            SceneObjectPart part = GetSceneObjectPart(localID);
+            if(part == null)
+                return;
 
-            if (group != null)
+            SceneObjectGroup group = part.ParentGroup;
+            if (group != null && !group.IsDeleted)
             {
                 if (m_parentScene.Permissions.CanEditObject(group, remoteClient))
                 {
-                    group.UpdateTextureEntry(localID, texture);
+                    part.UpdateTextureEntry(texture);
                 }
             }
         }
@@ -1661,8 +1664,11 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (wantedPhys != group.UsesPhysics && remoteClient != null)
                     {
-                        remoteClient.SendAlertMessage("Object physics canceled because exceeds the limit of " +
-                            m_parentScene.m_linksetPhysCapacity + " physical prims with shape type not set to None");
+                        if(m_parentScene.m_linksetPhysCapacity != 0)
+                            remoteClient.SendAlertMessage("Object physics cancelled because it exceeds limits for physical prims, either size or number of primswith shape type not set to None");
+                        else
+                            remoteClient.SendAlertMessage("Object physics cancelled because it exceeds size limits for physical prims");
+                        
                         group.RootPart.ScheduleFullUpdate();
                     }
                 }