aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-15 18:58:58 +0100
committerJustin Clark-Casey (justincc)2011-09-15 18:58:58 +0100
commitde19dc3024e5359f594d0a32c593d905163c24ea (patch)
treeb88cb3aa910cea4fe1fb4dc171413cf75ff0dd06
parentOnly bother to create an inventory xfer file if there are any items in a prim... (diff)
downloadopensim-SC_OLD-de19dc3024e5359f594d0a32c593d905163c24ea.zip
opensim-SC_OLD-de19dc3024e5359f594d0a32c593d905163c24ea.tar.gz
opensim-SC_OLD-de19dc3024e5359f594d0a32c593d905163c24ea.tar.bz2
opensim-SC_OLD-de19dc3024e5359f594d0a32c593d905163c24ea.tar.xz
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.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs18
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs20
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs32
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
8 files changed, 43 insertions, 43 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index e9ee7be..b5c6742 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4119,8 +4119,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4119 while (updatesThisCall < m_maxUpdates) 4119 while (updatesThisCall < m_maxUpdates)
4120 { 4120 {
4121 lock (m_entityProps.SyncRoot) 4121 lock (m_entityProps.SyncRoot)
4122 if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue)) 4122 if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
4123 break; 4123 break;
4124 4124
4125 ObjectPropertyUpdate update = (ObjectPropertyUpdate)iupdate; 4125 ObjectPropertyUpdate update = (ObjectPropertyUpdate)iupdate;
4126 if (update.SendFamilyProps) 4126 if (update.SendFamilyProps)
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 8b78701..1e4f0a4 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
101 101
102 part.ParentGroup.HasGroupChanged = true; 102 part.ParentGroup.HasGroupChanged = true;
103 103
104 part.GetProperties(client); 104 part.SendPropertiesToClient(client);
105 } 105 }
106 106
107 public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice) 107 public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice)
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
142 part.SalePrice = 10; 142 part.SalePrice = 10;
143 143
144 group.HasGroupChanged = true; 144 group.HasGroupChanged = true;
145 part.GetProperties(remoteClient); 145 part.SendPropertiesToClient(remoteClient);
146 part.TriggerScriptChangedEvent(Changed.OWNER); 146 part.TriggerScriptChangedEvent(Changed.OWNER);
147 group.ResumeScripts(); 147 group.ResumeScripts();
148 part.ScheduleFullUpdate(); 148 part.ScheduleFullUpdate();
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
274 if (group.UpdateInventoryItem(item)) 274 if (group.UpdateInventoryItem(item))
275 remoteClient.SendAgentAlertMessage("Script saved", false); 275 remoteClient.SendAgentAlertMessage("Script saved", false);
276 276
277 part.GetProperties(remoteClient); 277 part.SendPropertiesToClient(remoteClient);
278 278
279 // Trigger rerunning of script (use TriggerRezScript event, see RezScript) 279 // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
280 ArrayList errors = new ArrayList(); 280 ArrayList errors = new ArrayList();
@@ -999,7 +999,7 @@ namespace OpenSim.Region.Framework.Scenes
999 } 999 }
1000 1000
1001 group.RemoveInventoryItem(localID, itemID); 1001 group.RemoveInventoryItem(localID, itemID);
1002 part.GetProperties(remoteClient); 1002 part.SendPropertiesToClient(remoteClient);
1003 } 1003 }
1004 1004
1005 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId) 1005 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
@@ -1272,7 +1272,7 @@ namespace OpenSim.Region.Framework.Scenes
1272 1272
1273 if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) 1273 if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
1274 { 1274 {
1275 destPart.GetProperties(avatar.ControllingClient); 1275 destPart.SendPropertiesToClient(avatar.ControllingClient);
1276 } 1276 }
1277 } 1277 }
1278 1278
@@ -1427,7 +1427,7 @@ namespace OpenSim.Region.Framework.Scenes
1427 m_log.InfoFormat( 1427 m_log.InfoFormat(
1428 "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", 1428 "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
1429 item.Name, primLocalID, remoteClient.Name); 1429 item.Name, primLocalID, remoteClient.Name);
1430 part.GetProperties(remoteClient); 1430 part.SendPropertiesToClient(remoteClient);
1431 if (!Permissions.BypassPermissions()) 1431 if (!Permissions.BypassPermissions())
1432 { 1432 {
1433 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 1433 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
@@ -1522,7 +1522,7 @@ namespace OpenSim.Region.Framework.Scenes
1522 1522
1523 if (part.Inventory.UpdateInventoryItem(itemInfo)) 1523 if (part.Inventory.UpdateInventoryItem(itemInfo))
1524 { 1524 {
1525 part.GetProperties(remoteClient); 1525 part.SendPropertiesToClient(remoteClient);
1526 } 1526 }
1527 } 1527 }
1528 } 1528 }
@@ -1574,7 +1574,7 @@ namespace OpenSim.Region.Framework.Scenes
1574 // m_log.InfoFormat("[PRIMINVENTORY]: " + 1574 // m_log.InfoFormat("[PRIMINVENTORY]: " +
1575 // "Rezzed script {0} into prim local ID {1} for user {2}", 1575 // "Rezzed script {0} into prim local ID {1} for user {2}",
1576 // item.inventoryName, localID, remoteClient.Name); 1576 // item.inventoryName, localID, remoteClient.Name);
1577 part.GetProperties(remoteClient); 1577 part.SendPropertiesToClient(remoteClient);
1578 part.ParentGroup.ResumeScripts(); 1578 part.ParentGroup.ResumeScripts();
1579 } 1579 }
1580 else 1580 else
@@ -1632,7 +1632,7 @@ namespace OpenSim.Region.Framework.Scenes
1632 taskItem.AssetID = asset.FullID; 1632 taskItem.AssetID = asset.FullID;
1633 1633
1634 part.Inventory.AddInventoryItem(taskItem, false); 1634 part.Inventory.AddInventoryItem(taskItem, false);
1635 part.GetProperties(remoteClient); 1635 part.SendPropertiesToClient(remoteClient);
1636 1636
1637 part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); 1637 part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
1638 part.ParentGroup.ResumeScripts(); 1638 part.ParentGroup.ResumeScripts();
@@ -1746,7 +1746,7 @@ namespace OpenSim.Region.Framework.Scenes
1746 1746
1747 if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) 1747 if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar))
1748 { 1748 {
1749 destPart.GetProperties(avatar.ControllingClient); 1749 destPart.SendPropertiesToClient(avatar.ControllingClient);
1750 } 1750 }
1751 } 1751 }
1752 1752
@@ -2084,7 +2084,7 @@ namespace OpenSim.Region.Framework.Scenes
2084 SceneObjectPart part = GetSceneObjectPart(localID); 2084 SceneObjectPart part = GetSceneObjectPart(localID);
2085 if (part == null) 2085 if (part == null)
2086 continue; 2086 continue;
2087 part.GetProperties(remoteClient); 2087 part.SendPropertiesToClient(remoteClient);
2088 } 2088 }
2089 } 2089 }
2090 2090
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
144 { 144 {
145 if (((SceneObjectGroup) ent).LocalId == primLocalID) 145 if (((SceneObjectGroup) ent).LocalId == primLocalID)
146 { 146 {
147 ((SceneObjectGroup) ent).GetProperties(remoteClient); 147 ((SceneObjectGroup) ent).SendPropertiesToClient(remoteClient);
148 ((SceneObjectGroup) ent).IsSelected = true; 148 ((SceneObjectGroup) ent).IsSelected = true;
149 // A prim is only tainted if it's allowed to be edited by the person clicking it. 149 // A prim is only tainted if it's allowed to be edited by the person clicking it.
150 if (Permissions.CanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) 150 if (Permissions.CanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
167 { 167 {
168 if (part.LocalId == primLocalID) 168 if (part.LocalId == primLocalID)
169 { 169 {
170 part.GetProperties(remoteClient); 170 part.SendPropertiesToClient(remoteClient);
171 foundPrim = true; 171 foundPrim = true;
172 break; 172 break;
173 } 173 }
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
1728 1728
1729 #endregion 1729 #endregion
1730 1730
1731 #region Scheduling
1732
1733 public override void Update() 1731 public override void Update()
1734 { 1732 {
1735 // Check that the group was not deleted before the scheduled update 1733 // Check that the group was not deleted before the scheduled update
@@ -1880,7 +1878,14 @@ namespace OpenSim.Region.Framework.Scenes
1880 parts[i].SendTerseUpdateToAllClients(); 1878 parts[i].SendTerseUpdateToAllClients();
1881 } 1879 }
1882 1880
1883 #endregion 1881 /// <summary>
1882 /// Send metadata about the root prim (name, description, sale price, etc.) to a client.
1883 /// </summary>
1884 /// <param name="client"></param>
1885 public void SendPropertiesToClient(IClientAPI client)
1886 {
1887 m_rootPart.SendPropertiesToClient(client);
1888 }
1884 1889
1885 #region SceneGroupPart Methods 1890 #region SceneGroupPart Methods
1886 1891
@@ -2370,15 +2375,6 @@ namespace OpenSim.Region.Framework.Scenes
2370 } 2375 }
2371 2376
2372 /// <summary> 2377 /// <summary>
2373 /// Return metadata about a prim (name, description, sale price, etc.)
2374 /// </summary>
2375 /// <param name="client"></param>
2376 public void GetProperties(IClientAPI client)
2377 {
2378 m_rootPart.GetProperties(client);
2379 }
2380
2381 /// <summary>
2382 /// Set the name of a prim 2378 /// Set the name of a prim
2383 /// </summary> 2379 /// </summary>
2384 /// <param name="name"></param> 2380 /// <param name="name"></param>
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
1305 1305
1306 #endregion Public Properties with only Get 1306 #endregion Public Properties with only Get
1307 1307
1308 #region Private Methods
1309
1310 private uint ApplyMask(uint val, bool set, uint mask) 1308 private uint ApplyMask(uint val, bool set, uint mask)
1311 { 1309 {
1312 if (set) 1310 if (set)
@@ -1327,14 +1325,27 @@ namespace OpenSim.Region.Framework.Scenes
1327 m_updateFlag = 0; 1325 m_updateFlag = 0;
1328 } 1326 }
1329 1327
1330 private void SendObjectPropertiesToClient(UUID AgentID) 1328 /// <summary>
1329 /// Send this part's properties (name, description, inventory serial, base mask, etc.) to a client
1330 /// </summary>
1331 /// <param name="client"></param>
1332 public void SendPropertiesToClient(IClientAPI client)
1333 {
1334 client.SendObjectPropertiesReply(this);
1335 }
1336
1337 /// <summary>
1338 /// For the scene object group to which this part belongs, send that scene object's root part properties to a client.
1339 /// </summary>
1340 /// <param name="AgentID"></param>
1341 private void SendRootPartPropertiesToClient(UUID AgentID)
1331 { 1342 {
1332 m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar) 1343 m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
1333 { 1344 {
1334 // Ugly reference :( 1345 // Ugly reference :(
1335 if (avatar.UUID == AgentID) 1346 if (avatar.UUID == AgentID)
1336 { 1347 {
1337 m_parentGroup.GetProperties(avatar.ControllingClient); 1348 m_parentGroup.SendPropertiesToClient(avatar.ControllingClient);
1338 } 1349 }
1339 }); 1350 });
1340 } 1351 }
@@ -1363,8 +1374,6 @@ namespace OpenSim.Region.Framework.Scenes
1363 // } 1374 // }
1364 // } 1375 // }
1365 1376
1366 #endregion Private Methods
1367
1368 #region Public Methods 1377 #region Public Methods
1369 1378
1370 public void ResetExpire() 1379 public void ResetExpire()
@@ -2030,11 +2039,6 @@ namespace OpenSim.Region.Framework.Scenes
2030 return Vector3.Zero; 2039 return Vector3.Zero;
2031 } 2040 }
2032 2041
2033 public void GetProperties(IClientAPI client)
2034 {
2035 client.SendObjectPropertiesReply(this);
2036 }
2037
2038 /// <summary> 2042 /// <summary>
2039 /// Method for a prim to get it's world position from the group. 2043 /// Method for a prim to get it's world position from the group.
2040 /// </summary> 2044 /// </summary>
@@ -3453,7 +3457,7 @@ namespace OpenSim.Region.Framework.Scenes
3453 { 3457 {
3454 _groupID = groupID; 3458 _groupID = groupID;
3455 if (client != null) 3459 if (client != null)
3456 GetProperties(client); 3460 SendPropertiesToClient(client);
3457 m_updateFlag = 2; 3461 m_updateFlag = 2;
3458 } 3462 }
3459 3463
@@ -4273,10 +4277,10 @@ namespace OpenSim.Region.Framework.Scenes
4273 4277
4274 break; 4278 break;
4275 } 4279 }
4276 SendFullUpdateToAllClients();
4277 4280
4278 SendObjectPropertiesToClient(AgentID); 4281 SendFullUpdateToAllClients();
4279 4282
4283 SendRootPartPropertiesToClient(AgentID);
4280 } 4284 }
4281 } 4285 }
4282 4286
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
878 return; 878 return;
879 } 879 }
880 880
881 CreateInventoryFile(); 881 CreateInventoryFile();
882 882
883 // In principle, we should only do the rest if the inventory changed; 883 // In principle, we should only do the rest if the inventory changed;
884 // by sending m_inventorySerial to the client, it ought to know 884 // by sending m_inventorySerial to the client, it ought to know
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index cf8517d..070cdc0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3591,7 +3591,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3591 parentPrim.ScheduleGroupForFullUpdate(); 3591 parentPrim.ScheduleGroupForFullUpdate();
3592 3592
3593 if (client != null) 3593 if (client != null)
3594 parentPrim.GetProperties(client); 3594 parentPrim.SendPropertiesToClient(client);
3595 3595
3596 ScriptSleep(1000); 3596 ScriptSleep(1000);
3597 } 3597 }