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

Change SceneObjectPart.LocalID to .LocalId to be case matching 

with SceneObjectGroup.LocalId (and hence reduce confusion).
0.6.0-stable
Sean Dague 2008-03-05 18:57:13 +00:00
parent f64611862a
commit 4ea52b2105
9 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
View File

@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules
m_scene.ForEachClient(delegate(IClientAPI controller) m_scene.ForEachClient(delegate(IClientAPI controller)
{ {
controller.SendKillObject(m_scene.RegionInfo.RegionHandle, controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
selectedTree.LocalID); selectedTree.LocalId);
}); });
break; break;

4
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
sceneObject.SetScene(m_parentScene); sceneObject.SetScene(m_parentScene);
foreach (SceneObjectPart part in sceneObject.Children.Values) foreach (SceneObjectPart part in sceneObject.Children.Values)
{ {
part.LocalID = m_parentScene.PrimIDAllocate(); part.LocalId = m_parentScene.PrimIDAllocate();
} }
sceneObject.UpdateParentIDs(); sceneObject.UpdateParentIDs();
@ -378,7 +378,7 @@ namespace OpenSim.Region.Environment.Scenes
objupdate.ObjectData[1].UpdateFlags = 276957500; // flags; // ?? objupdate.ObjectData[1].UpdateFlags = 276957500; // flags; // ??
objupdate.ObjectData[1].ID = p.LocalID; objupdate.ObjectData[1].ID = p.LocalId;
objupdate.ObjectData[1].FullID = p.UUID; objupdate.ObjectData[1].FullID = p.UUID;
objupdate.ObjectData[1].OwnerID = p.OwnerID; objupdate.ObjectData[1].OwnerID = p.OwnerID;
objupdate.ObjectData[1].Text = Helpers.StringToField(p.Text); objupdate.ObjectData[1].Text = Helpers.StringToField(p.Text);

6
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
// Retrieve item // Retrieve item
TaskInventoryItem item = group.GetInventoryItem(part.LocalID, itemId); TaskInventoryItem item = group.GetInventoryItem(part.LocalId, itemId);
if (null == item) if (null == item)
{ {
return; return;
@ -206,8 +206,8 @@ namespace OpenSim.Region.Environment.Scenes
// Trigger rerunning of script (use TriggerRezScript event, see RezScript) // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
if (isScriptRunning) if (isScriptRunning)
{ {
group.StopScript(part.LocalID, item.ItemID); group.StopScript(part.LocalId, item.ItemID);
group.StartScript(part.LocalID, item.ItemID); group.StartScript(part.LocalId, item.ItemID);
} }
} }

2
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -177,7 +177,7 @@ namespace OpenSim.Region.Environment.Scenes
// trigger a touch_start for a script in the root prim // trigger a touch_start for a script in the root prim
foreach (SceneObjectPart part in obj.Children.Values) foreach (SceneObjectPart part in obj.Children.Values)
{ {
EventManager.TriggerObjectGrab(part.LocalID, part.OffsetPosition, remoteClient); EventManager.TriggerObjectGrab(part.LocalId, part.OffsetPosition, remoteClient);
} }
return; return;

26
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -152,8 +152,8 @@ namespace OpenSim.Region.Environment.Scenes
public override uint LocalId public override uint LocalId
{ {
get { return m_rootPart.LocalID; } get { return m_rootPart.LocalId; }
set { m_rootPart.LocalID = value; } set { m_rootPart.LocalId = value; }
} }
public override LLUUID UUID public override LLUUID UUID
@ -289,7 +289,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
reader.Read(); reader.Read();
SceneObjectPart part = SceneObjectPart.FromXml(reader); SceneObjectPart part = SceneObjectPart.FromXml(reader);
part.LocalID = m_scene.PrimIDAllocate(); part.LocalId = m_scene.PrimIDAllocate();
AddPart(part); AddPart(part);
part.RegionHandle = m_regionHandle; part.RegionHandle = m_regionHandle;
@ -304,7 +304,7 @@ namespace OpenSim.Region.Environment.Scenes
sr.Close(); sr.Close();
m_rootPart.LocalID = m_scene.PrimIDAllocate(); m_rootPart.LocalId = m_scene.PrimIDAllocate();
m_rootPart.ParentID = 0; m_rootPart.ParentID = 0;
m_rootPart.RegionHandle = m_regionHandle; m_rootPart.RegionHandle = m_regionHandle;
UpdateParentIDs(); UpdateParentIDs();
@ -834,7 +834,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
if (part.LocalID == localID) if (part.LocalId == localID)
{ {
return part; return part;
} }
@ -867,7 +867,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
if (part.LocalID == localID) if (part.LocalId == localID)
{ {
return true; return true;
} }
@ -909,7 +909,7 @@ namespace OpenSim.Region.Environment.Scenes
Quaternion newRot = parentRot.Inverse()*oldRot; Quaternion newRot = parentRot.Inverse()*oldRot;
linkPart.RotationOffset = new LLQuaternion(newRot.x, newRot.y, newRot.z, newRot.w); linkPart.RotationOffset = new LLQuaternion(newRot.x, newRot.y, newRot.z, newRot.w);
linkPart.ParentID = m_rootPart.LocalID; linkPart.ParentID = m_rootPart.LocalId;
linkPart.LinkNum = m_parts.Count; linkPart.LinkNum = m_parts.Count;
m_parts.Add(linkPart.UUID, linkPart); m_parts.Add(linkPart.UUID, linkPart);
@ -1035,7 +1035,7 @@ namespace OpenSim.Region.Environment.Scenes
private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation) private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation)
{ {
part.SetParent(this); part.SetParent(this);
part.ParentID = m_rootPart.LocalID; part.ParentID = m_rootPart.LocalId;
part.LinkNum = m_parts.Count; part.LinkNum = m_parts.Count;
m_parts.Add(part.UUID, part); m_parts.Add(part.UUID, part);
@ -1515,7 +1515,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="part"></param> /// <param name="part"></param>
private void SetPartAsNonRoot(SceneObjectPart part) private void SetPartAsNonRoot(SceneObjectPart part)
{ {
part.ParentID = m_rootPart.LocalID; part.ParentID = m_rootPart.LocalId;
} }
/// <summary> /// <summary>
@ -1655,7 +1655,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (part.UUID != m_rootPart.UUID) if (part.UUID != m_rootPart.UUID)
{ {
part.ParentID = m_rootPart.LocalID; part.ParentID = m_rootPart.LocalId;
} }
} }
} }
@ -1692,7 +1692,7 @@ namespace OpenSim.Region.Environment.Scenes
public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient) public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient)
{ {
if (m_rootPart.LocalID == localId) if (m_rootPart.LocalId == localId)
{ {
OnGrabGroup(offsetPos, remoteClient); OnGrabGroup(offsetPos, remoteClient);
} }
@ -1726,7 +1726,7 @@ namespace OpenSim.Region.Environment.Scenes
avatars[i].StandUp(); avatars[i].StandUp();
} }
avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalID); avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
} }
} }
} }
@ -1767,7 +1767,7 @@ namespace OpenSim.Region.Environment.Scenes
m_rootPart.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim); m_rootPart.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
if (part.LocalID != m_rootPart.LocalID) if (part.LocalId != m_rootPart.LocalId)
{ {
part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim); part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
} }

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -170,7 +170,7 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
string script = Helpers.FieldToUTF8String(asset.Data); string script = Helpers.FieldToUTF8String(asset.Data);
m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID,item.ItemID,script); m_parentGroup.Scene.EventManager.TriggerRezScript(LocalId,item.ItemID,script);
m_parentGroup.AddActiveScriptCount(1); m_parentGroup.AddActiveScriptCount(1);
ScheduleFullUpdate(); ScheduleFullUpdate();
} }
@ -211,7 +211,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (m_taskInventory.ContainsKey(itemId)) if (m_taskInventory.ContainsKey(itemId))
{ {
m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId); m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalId, itemId);
m_parentGroup.AddActiveScriptCount(-1); m_parentGroup.AddActiveScriptCount(-1);
} }
else else

30
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -153,12 +153,12 @@ namespace OpenSim.Region.Environment.Scenes
set { m_uuid = value; } set { m_uuid = value; }
} }
protected uint m_localID; protected uint m_localId;
public uint LocalID public uint LocalId
{ {
get { return m_localID; } get { return m_localId; }
set { m_localID = value; } set { m_localId = value; }
} }
protected string m_name; protected string m_name;
@ -571,7 +571,7 @@ namespace OpenSim.Region.Environment.Scenes
if (m_parentGroup != null) if (m_parentGroup != null)
{ {
if (m_parentGroup.Scene != null) if (m_parentGroup.Scene != null)
m_parentGroup.Scene.TriggerObjectChanged(LocalID, (uint)val); m_parentGroup.Scene.TriggerObjectChanged(LocalId, (uint)val);
} }
} }
@ -671,7 +671,7 @@ namespace OpenSim.Region.Environment.Scenes
CreatorID = OwnerID; CreatorID = OwnerID;
LastOwnerID = LLUUID.Zero; LastOwnerID = LLUUID.Zero;
UUID = LLUUID.Random(); UUID = LLUUID.Random();
LocalID = (uint) (localID); LocalId = (uint) (localID);
Shape = shape; Shape = shape;
// Todo: Add More Object Parameter from above! // Todo: Add More Object Parameter from above!
OwnershipCost = 0; OwnershipCost = 0;
@ -724,7 +724,7 @@ namespace OpenSim.Region.Environment.Scenes
CreatorID = creatorID; CreatorID = creatorID;
LastOwnerID = lastOwnerID; LastOwnerID = lastOwnerID;
UUID = LLUUID.Random(); UUID = LLUUID.Random();
LocalID = (uint) (localID); LocalId = (uint) (localID);
Shape = shape; Shape = shape;
OwnershipCost = 0; OwnershipCost = 0;
ObjectSaleType = (byte) 0; ObjectSaleType = (byte) 0;
@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Environment.Scenes
dupe.m_shape = m_shape.Copy(); dupe.m_shape = m_shape.Copy();
dupe.m_regionHandle = m_regionHandle; dupe.m_regionHandle = m_regionHandle;
dupe.UUID = LLUUID.Random(); dupe.UUID = LLUUID.Random();
dupe.LocalID = localID; dupe.LocalId = localID;
dupe.OwnerID = AgentID; dupe.OwnerID = AgentID;
dupe.GroupID = GroupID; dupe.GroupID = GroupID;
dupe.GroupPosition = new LLVector3(GroupPosition.X, GroupPosition.Y, GroupPosition.Z); dupe.GroupPosition = new LLVector3(GroupPosition.X, GroupPosition.Y, GroupPosition.Z);
@ -1337,7 +1337,7 @@ namespace OpenSim.Region.Environment.Scenes
PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
PhysActor.OnOutOfBounds += PhysicsOutOfBounds; PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
if (ParentID != 0 && ParentID != LocalID) if (ParentID != 0 && ParentID != LocalId)
{ {
if (ParentGroup.RootPart.PhysActor != null) if (ParentGroup.RootPart.PhysActor != null)
{ {
@ -1742,7 +1742,7 @@ namespace OpenSim.Region.Environment.Scenes
byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, m_shape, lPos, clientFlags, m_uuid, remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid,
OwnerID, OwnerID,
m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation); m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation);
} }
@ -1790,11 +1790,11 @@ namespace OpenSim.Region.Environment.Scenes
LLQuaternion mRot = RotationOffset; LLQuaternion mRot = RotationOffset;
if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
{ {
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot); remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot);
} }
else else
{ {
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot, Velocity, remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity,
RotationalVelocity); RotationalVelocity);
//System.Console.WriteLine("LID: " + LocalID + " RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString()); //System.Console.WriteLine("LID: " + LocalID + " RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString());
} }
@ -1805,11 +1805,11 @@ namespace OpenSim.Region.Environment.Scenes
LLQuaternion mRot = RotationOffset; LLQuaternion mRot = RotationOffset;
if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
{ {
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot); remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot);
} }
else else
{ {
remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot, Velocity, remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity,
RotationalVelocity); RotationalVelocity);
//System.Console.WriteLine("LID: " + LocalID + "RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString()); //System.Console.WriteLine("LID: " + LocalID + "RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString());
} }
@ -1932,7 +1932,7 @@ namespace OpenSim.Region.Environment.Scenes
info.AddValue("m_inventorySerial", m_inventorySerial); info.AddValue("m_inventorySerial", m_inventorySerial);
info.AddValue("m_uuid", m_uuid.UUID); info.AddValue("m_uuid", m_uuid.UUID);
info.AddValue("m_localID", m_localID); info.AddValue("m_localID", m_localId);
info.AddValue("m_name", m_name); info.AddValue("m_name", m_name);
info.AddValue("m_flags", Flags); info.AddValue("m_flags", Flags);
info.AddValue("m_material", m_material); info.AddValue("m_material", m_material);

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -956,7 +956,7 @@ namespace OpenSim.Region.Environment.Scenes
if (part != null) if (part != null)
{ {
m_requestedSitTargetID = part.LocalID; m_requestedSitTargetID = part.LocalId;
m_requestedSitOffset = offset; m_requestedSitOffset = offset;
} }
else else

4
OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
View File

@ -95,7 +95,7 @@ namespace SimpleApp
public override void OnGrabPart(SceneObjectPart part, LLVector3 offsetPos, IClientAPI remoteClient) public override void OnGrabPart(SceneObjectPart part, LLVector3 offsetPos, IClientAPI remoteClient)
{ {
m_parts.Remove(part.UUID); m_parts.Remove(part.UUID);
remoteClient.SendKillObject(m_regionHandle, part.LocalID); remoteClient.SendKillObject(m_regionHandle, part.LocalId);
remoteClient.AddMoney(1); remoteClient.AddMoney(1);
remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", LLUUID.Zero); remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", LLUUID.Zero);
} }
@ -106,7 +106,7 @@ namespace SimpleApp
{ {
m_parts.Remove(m_rootPart.UUID); m_parts.Remove(m_rootPart.UUID);
m_scene.RemoveEntity(this); m_scene.RemoveEntity(this);
remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalID); remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId);
remoteClient.AddMoney(50); remoteClient.AddMoney(50);
remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero); remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero);
} }