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

Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry.

Browse Source 
This eliminates some pointless memory use.
This commit is contained in:
Justin Clark-Casey (justincc)
2012-04-07 00:33:02 +01:00
parent 70b5a2dace
commit 7d8bb33c5b
8 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -571,7 +571,9 @@ namespace OpenSim.Region.Framework.Scenes
set { m_LoopSoundSlavePrims = value; }
}
// The UUID for the Region this Object is in.
/// <summary>
/// The UUID for the region this object is in.
/// </summary>
public UUID RegionUUID
{
get
@@ -584,6 +586,11 @@ namespace OpenSim.Region.Framework.Scenes
}
}
/// <summary>
/// The item ID that this object was rezzed from, if applicable.
/// </summary>
public UUID FromItemID { get; set; }
#endregion
// ~SceneObjectGroup()
@@ -646,18 +653,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public void SetFromItemID(UUID AssetId)
{
SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
parts[i].FromItemID = AssetId;
}
public UUID GetFromItemID()
{
return m_rootPart.FromItemID;
}
/// <summary>
/// Hooks this object up to the backup event so that it is persisted to the database when the update thread executes.
/// </summary>
@@ -2687,6 +2682,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_rootPart.AttachedPos = pos;
}
if (RootPart.GetStatusSandbox())
{
if (Util.GetDistanceTo(RootPart.StatusSandboxPos, pos) > 10)
@@ -2697,8 +2693,8 @@ namespace OpenSim.Region.Framework.Scenes
ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
}
}
AbsolutePosition = pos;
AbsolutePosition = pos;
HasGroupChanged = true;
}
@@ -3270,7 +3266,7 @@ namespace OpenSim.Region.Framework.Scenes
public virtual string ExtraToXmlString()
{
return "<ExtraFromItemID>" + GetFromItemID().ToString() + "</ExtraFromItemID>";
return "<ExtraFromItemID>" + FromItemID.ToString() + "</ExtraFromItemID>";
}
public virtual void ExtraFromXmlString(string xmlstr)
@@ -3282,7 +3278,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID uuid = UUID.Zero;
UUID.TryParse(id, out uuid);
SetFromItemID(uuid);
FromItemID = uuid;
}
#endregion