diff options
| author | Melanie | 2012-10-12 19:05:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:05:06 +0100 |
| commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
| tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
| download | opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a31a9ea..d5d8f26 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -3082,7 +3082,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3082 | // UUID, Name, TimeStampFull); | 3082 | // UUID, Name, TimeStampFull); |
| 3083 | 3083 | ||
| 3084 | if (ParentGroup.Scene != null) | 3084 | if (ParentGroup.Scene != null) |
| 3085 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this); | 3085 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, true); |
| 3086 | } | 3086 | } |
| 3087 | 3087 | ||
| 3088 | /// <summary> | 3088 | /// <summary> |
| @@ -3116,7 +3116,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3116 | } | 3116 | } |
| 3117 | 3117 | ||
| 3118 | if (ParentGroup.Scene != null) | 3118 | if (ParentGroup.Scene != null) |
| 3119 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this); | 3119 | ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, false); |
| 3120 | } | 3120 | } |
| 3121 | 3121 | ||
| 3122 | public void ScriptSetPhysicsStatus(bool UsePhysics) | 3122 | public void ScriptSetPhysicsStatus(bool UsePhysics) |