aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
diff options
context:
space:
mode:
authorMelanie2012-02-26 18:11:38 +0100
committerMelanie2012-02-26 18:11:38 +0100
commitfca8c82232a42191270cb8d18dba6b54d382a2c2 (patch)
tree0a5b5e3e7d7034b7fd4e620fc0d21ec7c9f5abcb /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
downloadopensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.zip
opensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.gz
opensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.bz2
opensim-SC_OLD-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.xz
Move KeyframeMotion from SOG to SOP because we can't persist it any
other way because SOG doesn't technically exist in the DB
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 098123a..192d55f 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -355,11 +355,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
355 355
356 foreach (SceneObjectGroup objectGroup in objlist) 356 foreach (SceneObjectGroup objectGroup in objlist)
357 { 357 {
358 if (objectGroup.KeyframeMotion != null) 358 if (objectGroup.RootPart.KeyframeMotion != null)
359 objectGroup.KeyframeMotion.Stop(); 359 objectGroup.RootPart.KeyframeMotion.Stop();
360 objectGroup.RootPart.SetForce(Vector3.Zero); 360 objectGroup.RootPart.SetForce(Vector3.Zero);
361 objectGroup.RootPart.SetAngularImpulse(Vector3.Zero, false); 361 objectGroup.RootPart.SetAngularImpulse(Vector3.Zero, false);
362 objectGroup.KeyframeMotion = null; 362 objectGroup.RootPart.KeyframeMotion = null;
363 363
364 Vector3 inventoryStoredPosition = new Vector3 364 Vector3 inventoryStoredPosition = new Vector3
365 (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize) 365 (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)