aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-10-07 05:12:39 +0200
committerMelanie2011-04-03 20:32:04 +0100
commitadb14ad20acce44cb4b269b0d518b210f9f5eae4 (patch)
tree59a789a7531ff74e71e58dfd8e643318c429dd75
parentImplement rezzing coalesced objects (diff)
downloadopensim-SC_OLD-adb14ad20acce44cb4b269b0d518b210f9f5eae4.zip
opensim-SC_OLD-adb14ad20acce44cb4b269b0d518b210f9f5eae4.tar.gz
opensim-SC_OLD-adb14ad20acce44cb4b269b0d518b210f9f5eae4.tar.bz2
opensim-SC_OLD-adb14ad20acce44cb4b269b0d518b210f9f5eae4.tar.xz
Implement rezzing coalesced objects
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs11
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index a7d59c7..9fbfc34 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -247,11 +247,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
247 247
248 Vector3 originalPosition = objectGroup.AbsolutePosition; 248 Vector3 originalPosition = objectGroup.AbsolutePosition;
249 249
250 // Restore attachment data after trip through the sim
251 if (objectGroup.RootPart.AttachPoint > 0)
252 inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
253 objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
254
255 objectGroup.AbsolutePosition = inventoryStoredPosition; 250 objectGroup.AbsolutePosition = inventoryStoredPosition;
256 251
257 // Make sure all bits but the ones we want are clear 252 // Make sure all bits but the ones we want are clear
@@ -815,13 +810,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
815 if (!attachment) 810 if (!attachment)
816 { 811 {
817 if (group.RootPart.Shape.PCode == (byte)PCode.Prim) 812 if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
818 {
819 // Save attachment data
820 group.RootPart.AttachPoint = group.RootPart.Shape.State;
821 group.RootPart.AttachOffset = storedPosition;
822
823 group.ClearPartAttachmentData(); 813 group.ClearPartAttachmentData();
824 }
825 814
826 // Fire on_rez 815 // Fire on_rez
827 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1); 816 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);