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

clean code a bit

LSLKeyTest
UbitUmarov 2015-11-19 15:02:12 +00:00
parent 2e43343ca9
commit 36f7e96392
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -953,6 +953,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
} }
group.ResetIDs();
if (!attachment) if (!attachment)
{ {
// If it's rezzed in world, select it. Much easier to // If it's rezzed in world, select it. Much easier to
@ -966,12 +968,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (rootPart.Shape.PCode == (byte)PCode.Prim) if (rootPart.Shape.PCode == (byte)PCode.Prim)
group.ClearPartAttachmentData(); group.ClearPartAttachmentData();
} }
else
group.ResetIDs();
if (attachment)
{ {
// group.RootPart.Flags |= PrimFlags.Phantom;
group.IsAttachment = true; group.IsAttachment = true;
} }
@ -983,14 +981,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// attachment properly. // attachment properly.
m_Scene.AddNewSceneObject(group, true, false); m_Scene.AddNewSceneObject(group, true, false);
// if attachment we set it's asset id so object updates
// can reflect that, if not, we set it's position in world.
if (!attachment) if (!attachment)
{
group.ScheduleGroupForFullUpdate();
group.AbsolutePosition = pos + veclist[i]; group.AbsolutePosition = pos + veclist[i];
}
group.SetGroup(remoteClient.ActiveGroupId, remoteClient); group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
@ -1000,7 +992,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1); group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
rootPart.ParentGroup.ResumeScripts(); rootPart.ParentGroup.ResumeScripts();
rootPart.ScheduleFullUpdate(); group.ScheduleGroupForFullUpdate();
} }
// m_log.DebugFormat( // m_log.DebugFormat(
@ -1010,7 +1002,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// remoteClient.Name); // remoteClient.Name);
} }
group.SetGroup(remoteClient.ActiveGroupId, remoteClient); // group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
if (item != null) if (item != null)
DoPostRezWhenFromItem(item, attachment); DoPostRezWhenFromItem(item, attachment);