diff options
| author | UbitUmarov | 2017-06-12 13:34:39 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-06-12 13:34:39 +0100 |
| commit | f62400c4ca789456f7ad8d54475388684c8c3ebb (patch) | |
| tree | af8c8b0b32e4e28738d141309eaf7e41a437d22c /OpenSim/Region | |
| parent | make some web request errors visible, so cause of later asset not found is clear (diff) | |
| download | opensim-SC-f62400c4ca789456f7ad8d54475388684c8c3ebb.zip opensim-SC-f62400c4ca789456f7ad8d54475388684c8c3ebb.tar.gz opensim-SC-f62400c4ca789456f7ad8d54475388684c8c3ebb.tar.bz2 opensim-SC-f62400c4ca789456f7ad8d54475388684c8c3ebb.tar.xz | |
improve english on few messages (thx)
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 | ||||
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 |
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 | } |