aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
-rwxr-xr-xOpenSim/Region/Framework/Scenes/SceneGraph.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bba7a96..057ca17 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2865,7 +2865,7 @@ namespace OpenSim.Region.Framework.Scenes
2865 root.SendPropertiesToClient(sp.ControllingClient); 2865 root.SendPropertiesToClient(sp.ControllingClient);
2866 if (oldUsePhysics && (root.Flags & PrimFlags.Physics) == 0) 2866 if (oldUsePhysics && (root.Flags & PrimFlags.Physics) == 0)
2867 { 2867 {
2868 sp.ControllingClient.SendAlertMessage("Object physics canceled"); 2868 sp.ControllingClient.SendAlertMessage("Object physics cancelled");
2869 } 2869 }
2870 } 2870 }
2871 } 2871 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b51c169..6419f11 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1662,9 +1662,9 @@ namespace OpenSim.Region.Framework.Scenes
1662 if (wantedPhys != group.UsesPhysics && remoteClient != null) 1662 if (wantedPhys != group.UsesPhysics && remoteClient != null)
1663 { 1663 {
1664 if(m_parentScene.m_linksetPhysCapacity != 0) 1664 if(m_parentScene.m_linksetPhysCapacity != 0)
1665 remoteClient.SendAlertMessage("Object physics canceled because exceeds limits for physical prims, either size or number of primswith shape type not set to None"); 1665 remoteClient.SendAlertMessage("Object physics cancelled because it exceeds limits for physical prims, either size or number of primswith shape type not set to None");
1666 else 1666 else
1667 remoteClient.SendAlertMessage("Object physics canceled because exceeds size limits for physical prims"); 1667 remoteClient.SendAlertMessage("Object physics cancelled because it exceeds size limits for physical prims");
1668 1668
1669 group.RootPart.ScheduleFullUpdate(); 1669 group.RootPart.ScheduleFullUpdate();
1670 } 1670 }