ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

clean code a bit

Browse Source
This commit is contained in:
UbitUmarov
2015-11-19 15:02:12 +00:00
parent 2e43343ca9
commit 36f7e96392
1 changed files with 5 additions and 13 deletions
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 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)
group.ClearPartAttachmentData();
}
group.ResetIDs();
if (attachment)
else
{
// group.RootPart.Flags |= PrimFlags.Phantom;
group.IsAttachment = true;
}
@@ -983,14 +981,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// attachment properly.
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)
{
group.ScheduleGroupForFullUpdate();
group.AbsolutePosition = pos + veclist[i];
}
group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
@@ -1000,7 +992,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
rootPart.ParentGroup.ResumeScripts();
rootPart.ScheduleFullUpdate();
group.ScheduleGroupForFullUpdate();
}
// m_log.DebugFormat(
@@ -1010,7 +1002,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// remoteClient.Name);
}
group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
// group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
if (item != null)
DoPostRezWhenFromItem(item, attachment);