diff options
author | Justin Clark-Casey (justincc) | 2011-09-15 18:58:58 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-15 18:58:58 +0100 |
commit | de19dc3024e5359f594d0a32c593d905163c24ea (patch) | |
tree | b88cb3aa910cea4fe1fb4dc171413cf75ff0dd06 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Only bother to create an inventory xfer file if there are any items in a prim... (diff) | |
download | opensim-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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 18 |
1 files changed, 9 insertions, 9 deletions
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 | ||