aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-02-26 02:52:08 +0100
committerMelanie2012-02-26 02:52:08 +0100
commitedc78defed18a0eb735097dc64ea5e0ed722caac (patch)
tree913d153d8a420e6da811068f3158f7b9799bb7e4
parentMerge branch 'ubitwork' (diff)
downloadopensim-SC_OLD-edc78defed18a0eb735097dc64ea5e0ed722caac.zip
opensim-SC_OLD-edc78defed18a0eb735097dc64ea5e0ed722caac.tar.gz
opensim-SC_OLD-edc78defed18a0eb735097dc64ea5e0ed722caac.tar.bz2
opensim-SC_OLD-edc78defed18a0eb735097dc64ea5e0ed722caac.tar.xz
Zero force and torque on take so that items don't run away when rezzed
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 26650a5..098123a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -357,6 +357,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
357 { 357 {
358 if (objectGroup.KeyframeMotion != null) 358 if (objectGroup.KeyframeMotion != null)
359 objectGroup.KeyframeMotion.Stop(); 359 objectGroup.KeyframeMotion.Stop();
360 objectGroup.RootPart.SetForce(Vector3.Zero);
361 objectGroup.RootPart.SetAngularImpulse(Vector3.Zero, false);
360 objectGroup.KeyframeMotion = null; 362 objectGroup.KeyframeMotion = null;
361 363
362 Vector3 inventoryStoredPosition = new Vector3 364 Vector3 inventoryStoredPosition = new Vector3