OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ClearPartAttachmentData before adding object to scene, not after

LSLKeyTest
UbitUmarov 2015-11-19 14:45:39 +00:00
parent 8505ca88dd
commit 2e43343ca9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -962,6 +962,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{ {
part.CreateSelected = true; part.CreateSelected = true;
} }
if (rootPart.Shape.PCode == (byte)PCode.Prim)
group.ClearPartAttachmentData();
} }
group.ResetIDs(); group.ResetIDs();
@ -993,9 +996,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (!attachment) if (!attachment)
{ {
if (rootPart.Shape.PCode == (byte)PCode.Prim)
group.ClearPartAttachmentData();
// Fire on_rez // Fire on_rez
group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1); group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
rootPart.ParentGroup.ResumeScripts(); rootPart.ParentGroup.ResumeScripts();