From de19dc3024e5359f594d0a32c593d905163c24ea Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Sep 2011 18:58:58 +0100
Subject: refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient()
to reflect what it actually does
This also makes it consistent with some other methods that send data to the client.
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 18 ++++++------
.../Framework/Scenes/Scene.PacketHandlers.cs | 4 +--
.../Region/Framework/Scenes/SceneObjectGroup.cs | 20 ++++++--------
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 32 ++++++++++++----------
.../Framework/Scenes/SceneObjectPartInventory.cs | 2 +-
5 files changed, 38 insertions(+), 38 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9dcd10a..f9dba2d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Framework.Scenes
if (group.UpdateInventoryItem(item))
remoteClient.SendAgentAlertMessage("Script saved", false);
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
// Trigger rerunning of script (use TriggerRezScript event, see RezScript)
ArrayList errors = new ArrayList();
@@ -999,7 +999,7 @@ namespace OpenSim.Region.Framework.Scenes
}
group.RemoveInventoryItem(localID, itemID);
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
}
private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
@@ -1272,7 +1272,7 @@ namespace OpenSim.Region.Framework.Scenes
if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
{
- destPart.GetProperties(avatar.ControllingClient);
+ destPart.SendPropertiesToClient(avatar.ControllingClient);
}
}
@@ -1427,7 +1427,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.InfoFormat(
"[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
item.Name, primLocalID, remoteClient.Name);
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
if (!Permissions.BypassPermissions())
{
if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
@@ -1522,7 +1522,7 @@ namespace OpenSim.Region.Framework.Scenes
if (part.Inventory.UpdateInventoryItem(itemInfo))
{
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
}
}
}
@@ -1574,7 +1574,7 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.InfoFormat("[PRIMINVENTORY]: " +
// "Rezzed script {0} into prim local ID {1} for user {2}",
// item.inventoryName, localID, remoteClient.Name);
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
part.ParentGroup.ResumeScripts();
}
else
@@ -1632,7 +1632,7 @@ namespace OpenSim.Region.Framework.Scenes
taskItem.AssetID = asset.FullID;
part.Inventory.AddInventoryItem(taskItem, false);
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
part.ParentGroup.ResumeScripts();
@@ -1746,7 +1746,7 @@ namespace OpenSim.Region.Framework.Scenes
if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
{
- destPart.GetProperties(avatar.ControllingClient);
+ destPart.SendPropertiesToClient(avatar.ControllingClient);
}
}
@@ -2084,7 +2084,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectPart part = GetSceneObjectPart(localID);
if (part == null)
continue;
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
}
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 29d01d6..270e582 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (((SceneObjectGroup) ent).LocalId == primLocalID)
{
- ((SceneObjectGroup) ent).GetProperties(remoteClient);
+ ((SceneObjectGroup) ent).SendPropertiesToClient(remoteClient);
((SceneObjectGroup) ent).IsSelected = true;
// A prim is only tainted if it's allowed to be edited by the person clicking it.
if (Permissions.CanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (part.LocalId == primLocalID)
{
- part.GetProperties(remoteClient);
+ part.SendPropertiesToClient(remoteClient);
foundPrim = true;
break;
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2819545..e7f2491 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1728,8 +1728,6 @@ namespace OpenSim.Region.Framework.Scenes
#endregion
- #region Scheduling
-
public override void Update()
{
// Check that the group was not deleted before the scheduled update
@@ -1880,7 +1878,14 @@ namespace OpenSim.Region.Framework.Scenes
parts[i].SendTerseUpdateToAllClients();
}
- #endregion
+ ///
+ /// Send metadata about the root prim (name, description, sale price, etc.) to a client.
+ ///
+ ///
+ public void SendPropertiesToClient(IClientAPI client)
+ {
+ m_rootPart.SendPropertiesToClient(client);
+ }
#region SceneGroupPart Methods
@@ -2370,15 +2375,6 @@ namespace OpenSim.Region.Framework.Scenes
}
///
- /// Return metadata about a prim (name, description, sale price, etc.)
- ///
- ///
- public void GetProperties(IClientAPI client)
- {
- m_rootPart.GetProperties(client);
- }
-
- ///
/// Set the name of a prim
///
///
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 04fef83..7203663 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1305,8 +1305,6 @@ namespace OpenSim.Region.Framework.Scenes
#endregion Public Properties with only Get
- #region Private Methods
-
private uint ApplyMask(uint val, bool set, uint mask)
{
if (set)
@@ -1327,14 +1325,27 @@ namespace OpenSim.Region.Framework.Scenes
m_updateFlag = 0;
}
- private void SendObjectPropertiesToClient(UUID AgentID)
+ ///
+ /// Send this part's properties (name, description, inventory serial, base mask, etc.) to a client
+ ///
+ ///
+ public void SendPropertiesToClient(IClientAPI client)
+ {
+ client.SendObjectPropertiesReply(this);
+ }
+
+ ///
+ /// For the scene object group to which this part belongs, send that scene object's root part properties to a client.
+ ///
+ ///
+ private void SendRootPartPropertiesToClient(UUID AgentID)
{
m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
{
// Ugly reference :(
if (avatar.UUID == AgentID)
{
- m_parentGroup.GetProperties(avatar.ControllingClient);
+ m_parentGroup.SendPropertiesToClient(avatar.ControllingClient);
}
});
}
@@ -1363,8 +1374,6 @@ namespace OpenSim.Region.Framework.Scenes
// }
// }
- #endregion Private Methods
-
#region Public Methods
public void ResetExpire()
@@ -2030,11 +2039,6 @@ namespace OpenSim.Region.Framework.Scenes
return Vector3.Zero;
}
- public void GetProperties(IClientAPI client)
- {
- client.SendObjectPropertiesReply(this);
- }
-
///
/// Method for a prim to get it's world position from the group.
///
@@ -3453,7 +3457,7 @@ namespace OpenSim.Region.Framework.Scenes
{
_groupID = groupID;
if (client != null)
- GetProperties(client);
+ SendPropertiesToClient(client);
m_updateFlag = 2;
}
@@ -4273,10 +4277,10 @@ namespace OpenSim.Region.Framework.Scenes
break;
}
- SendFullUpdateToAllClients();
- SendObjectPropertiesToClient(AgentID);
+ SendFullUpdateToAllClients();
+ SendRootPartPropertiesToClient(AgentID);
}
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index d63b411..9446741 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -878,7 +878,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
- CreateInventoryFile();
+ CreateInventoryFile();
// In principle, we should only do the rest if the inventory changed;
// by sending m_inventorySerial to the client, it ought to know
--
cgit v1.1