diff options
author | UbitUmarov | 2015-11-19 14:45:39 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-19 14:45:39 +0000 |
commit | 2e43343ca9578fc8455a458f015957c3d6947e85 (patch) | |
tree | bde0c0a777edc0ad0d1a0725ed09c10bf3fc668e /OpenSim/Region/CoreModules/Framework | |
parent | work around some 'tests' errors: use one autoresetevent per scene (diff) | |
download | opensim-SC_OLD-2e43343ca9578fc8455a458f015957c3d6947e85.zip opensim-SC_OLD-2e43343ca9578fc8455a458f015957c3d6947e85.tar.gz opensim-SC_OLD-2e43343ca9578fc8455a458f015957c3d6947e85.tar.bz2 opensim-SC_OLD-2e43343ca9578fc8455a458f015957c3d6947e85.tar.xz |
ClearPartAttachmentData before adding object to scene, not after
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 6 |
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 e5373c3..b1de341 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -962,6 +962,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
962 | { | 962 | { |
963 | part.CreateSelected = true; | 963 | part.CreateSelected = true; |
964 | } | 964 | } |
965 | |||
966 | if (rootPart.Shape.PCode == (byte)PCode.Prim) | ||
967 | group.ClearPartAttachmentData(); | ||
965 | } | 968 | } |
966 | 969 | ||
967 | group.ResetIDs(); | 970 | group.ResetIDs(); |
@@ -993,9 +996,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
993 | 996 | ||
994 | if (!attachment) | 997 | if (!attachment) |
995 | { | 998 | { |
996 | if (rootPart.Shape.PCode == (byte)PCode.Prim) | ||
997 | group.ClearPartAttachmentData(); | ||
998 | |||
999 | // Fire on_rez | 999 | // Fire on_rez |
1000 | group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1); | 1000 | group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1); |
1001 | rootPart.ParentGroup.ResumeScripts(); | 1001 | rootPart.ParentGroup.ResumeScripts(); |