aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorDan Lake2013-02-14 20:06:22 -0800
committerDan Lake2013-02-14 20:06:22 -0800
commite09467b30d5d27181c158961e95df25cd6001be5 (patch)
tree439acb650990a3495187f55d8a69b9a78f359c00 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentUse SortedDictionary in StatsManager instead of regular Dictionary so stats w... (diff)
parentEnable one sub-test in TestJsonSetValue() which now works (using identifier w... (diff)
downloadopensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.zip
opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.gz
opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.bz2
opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9b29973..cce8b21 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4316,6 +4316,7 @@ namespace OpenSim.Region.Framework.Scenes
4316 } 4316 }
4317 4317
4318 PhysActor = pa; 4318 PhysActor = pa;
4319 ParentGroup.Scene.EventManager.TriggerObjectAddedToPhysicalScene(this);
4319 } 4320 }
4320 4321
4321 /// <summary> 4322 /// <summary>
@@ -4328,6 +4329,7 @@ namespace OpenSim.Region.Framework.Scenes
4328 /// </remarks> 4329 /// </remarks>
4329 public void RemoveFromPhysics() 4330 public void RemoveFromPhysics()
4330 { 4331 {
4332 ParentGroup.Scene.EventManager.TriggerObjectRemovedFromPhysicalScene(this);
4331 ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor); 4333 ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
4332 PhysActor = null; 4334 PhysActor = null;
4333 } 4335 }