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

refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.

0.7.4.1
Justin Clark-Casey (justincc) 2012-03-31 01:52:06 +01:00
parent f0406f9fe2
commit 32a953fed7
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
View File

@ -79,7 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
} }
SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape); SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
SceneObjectPart rootPart = sceneObject.GetChildPart(sceneObject.UUID); SceneObjectPart rootPart = sceneObject.GetPart(sceneObject.UUID);
// if grass or tree, make phantom // if grass or tree, make phantom
//rootPart.TrimPermissions(); //rootPart.TrimPermissions();

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1833,7 +1833,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
AddRestoredSceneObject(group, true, true); AddRestoredSceneObject(group, true, true);
EventManager.TriggerOnSceneObjectLoaded(group); EventManager.TriggerOnSceneObjectLoaded(group);
SceneObjectPart rootPart = group.GetChildPart(group.UUID); SceneObjectPart rootPart = group.GetPart(group.UUID);
rootPart.Flags &= ~PrimFlags.Scripted; rootPart.Flags &= ~PrimFlags.Scripted;
rootPart.TrimPermissions(); rootPart.TrimPermissions();
@ -4174,7 +4174,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (ent is SceneObjectGroup) if (ent is SceneObjectGroup)
{ {
SceneObjectPart part = ((SceneObjectGroup)ent).GetChildPart(((SceneObjectGroup)ent).UUID); SceneObjectPart part = ((SceneObjectGroup)ent).GetPart(((SceneObjectGroup)ent).UUID);
if (part != null) if (part != null)
{ {
if (part.Name == cmdparams[2]) if (part.Name == cmdparams[2])

4
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(localID); SceneObjectGroup group = GetGroupByPrim(localID);
if (group == null) if (group == null)
return null; return null;
return group.GetChildPart(localID); return group.GetPart(localID);
} }
/// <summary> /// <summary>
@ -1062,7 +1062,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(fullID); SceneObjectGroup group = GetGroupByPrim(fullID);
if (group == null) if (group == null)
return null; return null;
return group.GetChildPart(fullID); return group.GetPart(fullID);
} }
/// <summary> /// <summary>

8
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID; UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
TaskInventoryItem taskItem = new TaskInventoryItem(); TaskInventoryItem taskItem = new TaskInventoryItem();
@ -170,7 +170,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns>null if the item does not exist</returns> /// <returns>null if the item does not exist</returns>
public TaskInventoryItem GetInventoryItem(uint primID, UUID itemID) public TaskInventoryItem GetInventoryItem(uint primID, UUID itemID)
{ {
SceneObjectPart part = GetChildPart(primID); SceneObjectPart part = GetPart(primID);
if (part != null) if (part != null)
{ {
return part.Inventory.GetInventoryItem(itemID); return part.Inventory.GetInventoryItem(itemID);
@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns>false if the item did not exist, true if the update occurred succesfully</returns> /// <returns>false if the item did not exist, true if the update occurred succesfully</returns>
public bool UpdateInventoryItem(TaskInventoryItem item) public bool UpdateInventoryItem(TaskInventoryItem item)
{ {
SceneObjectPart part = GetChildPart(item.ParentPartID); SceneObjectPart part = GetPart(item.ParentPartID);
if (part != null) if (part != null)
{ {
part.Inventory.UpdateInventoryItem(item); part.Inventory.UpdateInventoryItem(item);
@ -214,7 +214,7 @@ namespace OpenSim.Region.Framework.Scenes
public int RemoveInventoryItem(uint localID, UUID itemID) public int RemoveInventoryItem(uint localID, UUID itemID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
int type = part.Inventory.RemoveInventoryItem(itemID); int type = part.Inventory.RemoveInventoryItem(itemID);

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

@ -1127,7 +1127,7 @@ namespace OpenSim.Region.Framework.Scenes
public UUID GetPartsFullID(uint localID) public UUID GetPartsFullID(uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
return part.UUID; return part.UUID;
@ -1143,7 +1143,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
SceneObjectPart part = GetChildPart(localId); SceneObjectPart part = GetPart(localId);
OnGrabPart(part, offsetPos, remoteClient); OnGrabPart(part, offsetPos, remoteClient);
} }
} }
@ -1904,8 +1904,8 @@ namespace OpenSim.Region.Framework.Scenes
/// Get a part with a given UUID /// Get a part with a given UUID
/// </summary> /// </summary>
/// <param name="primID"></param> /// <param name="primID"></param>
/// <returns>null if a child part with the primID was not found</returns> /// <returns>null if a part with the primID was not found</returns>
public SceneObjectPart GetChildPart(UUID primID) public SceneObjectPart GetPart(UUID primID)
{ {
SceneObjectPart childPart; SceneObjectPart childPart;
m_parts.TryGetValue(primID, out childPart); m_parts.TryGetValue(primID, out childPart);
@ -1916,8 +1916,8 @@ namespace OpenSim.Region.Framework.Scenes
/// Get a part with a given local ID /// Get a part with a given local ID
/// </summary> /// </summary>
/// <param name="localID"></param> /// <param name="localID"></param>
/// <returns>null if a child part with the local ID was not found</returns> /// <returns>null if a part with the local ID was not found</returns>
public SceneObjectPart GetChildPart(uint localID) public SceneObjectPart GetPart(uint localID)
{ {
SceneObjectPart[] parts = m_parts.GetArray(); SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++) for (int i = 0; i < parts.Length; i++)
@ -2035,7 +2035,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns>The object group of the newly delinked prim. Null if part could not be found</returns> /// <returns>The object group of the newly delinked prim. Null if part could not be found</returns>
public SceneObjectGroup DelinkFromGroup(uint partID, bool sendEvents) public SceneObjectGroup DelinkFromGroup(uint partID, bool sendEvents)
{ {
SceneObjectPart linkPart = GetChildPart(partID); SceneObjectPart linkPart = GetPart(partID);
if (linkPart != null) if (linkPart != null)
{ {
@ -2326,7 +2326,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="localID"></param> /// <param name="localID"></param>
public void SetPartName(string name, uint localID) public void SetPartName(string name, uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
part.Name = name; part.Name = name;
@ -2335,7 +2335,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SetPartDescription(string des, uint localID) public void SetPartDescription(string des, uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
part.Description = des; part.Description = des;
@ -2344,7 +2344,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SetPartText(string text, uint localID) public void SetPartText(string text, uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
part.SetText(text); part.SetText(text);
@ -2353,7 +2353,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SetPartText(string text, UUID partID) public void SetPartText(string text, UUID partID)
{ {
SceneObjectPart part = GetChildPart(partID); SceneObjectPart part = GetPart(partID);
if (part != null) if (part != null)
{ {
part.SetText(text); part.SetText(text);
@ -2362,7 +2362,7 @@ namespace OpenSim.Region.Framework.Scenes
public string GetPartName(uint localID) public string GetPartName(uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
return part.Name; return part.Name;
@ -2372,7 +2372,7 @@ namespace OpenSim.Region.Framework.Scenes
public string GetPartDescription(uint localID) public string GetPartDescription(uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
return part.Description; return part.Description;
@ -2390,7 +2390,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="SetVolumeDetect"></param> /// <param name="SetVolumeDetect"></param>
public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect) public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect)
{ {
SceneObjectPart selectionPart = GetChildPart(localID); SceneObjectPart selectionPart = GetPart(localID);
if (SetTemporary && Scene != null) if (SetTemporary && Scene != null)
{ {
@ -2427,7 +2427,7 @@ namespace OpenSim.Region.Framework.Scenes
public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data) public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
part.UpdateExtraParam(type, inUse, data); part.UpdateExtraParam(type, inUse, data);
@ -2441,7 +2441,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="textureEntry"></param> /// <param name="textureEntry"></param>
public void UpdateTextureEntry(uint localID, byte[] textureEntry) public void UpdateTextureEntry(uint localID, byte[] textureEntry)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
part.UpdateTextureEntry(textureEntry); part.UpdateTextureEntry(textureEntry);
@ -2473,7 +2473,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="shapeBlock"></param> /// <param name="shapeBlock"></param>
public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID) public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
part.UpdateShape(shapeBlock); part.UpdateShape(shapeBlock);
@ -2685,7 +2685,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="localID"></param> /// <param name="localID"></param>
public void UpdateSinglePosition(Vector3 pos, uint localID) public void UpdateSinglePosition(Vector3 pos, uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
// SceneObjectPart[] parts = m_parts.GetArray(); // SceneObjectPart[] parts = m_parts.GetArray();
// for (int i = 0; i < parts.Length; i++) // for (int i = 0; i < parts.Length; i++)
@ -2824,7 +2824,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="localID"></param> /// <param name="localID"></param>
public void UpdateSingleRotation(Quaternion rot, uint localID) public void UpdateSingleRotation(Quaternion rot, uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
SceneObjectPart[] parts = m_parts.GetArray(); SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++) for (int i = 0; i < parts.Length; i++)
@ -2853,7 +2853,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="localID"></param> /// <param name="localID"></param>
public void UpdateSingleRotation(Quaternion rot, Vector3 pos, uint localID) public void UpdateSingleRotation(Quaternion rot, Vector3 pos, uint localID)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetPart(localID);
if (part != null) if (part != null)
{ {
// m_log.DebugFormat( // m_log.DebugFormat(

2
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -623,7 +623,7 @@ namespace OpenSim.Region.Framework.Scenes
group.ResetIDs(); group.ResetIDs();
SceneObjectPart rootPart = group.GetChildPart(group.UUID); SceneObjectPart rootPart = group.GetPart(group.UUID);
// Since renaming the item in the inventory does not affect the name stored // Since renaming the item in the inventory does not affect the name stored
// in the serialization, transfer the correct name from the inventory to the // in the serialization, transfer the correct name from the inventory to the

2
OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
View File

@ -510,7 +510,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
} }
SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape); SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
SceneObjectPart rootPart = sceneObject.GetChildPart(sceneObject.UUID); SceneObjectPart rootPart = sceneObject.GetPart(sceneObject.UUID);
rootPart.AddFlag(PrimFlags.Phantom); rootPart.AddFlag(PrimFlags.Phantom);