diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-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 c2ec5d0..931fedc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
261 | item.AssetID = asset.FullID; | 261 | item.AssetID = asset.FullID; |
262 | group.UpdateInventoryItem(item); | 262 | group.UpdateInventoryItem(item); |
263 | 263 | ||
264 | part.GetProperties(remoteClient); | 264 | part.SendPropertiesToClient(remoteClient); |
265 | 265 | ||
266 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) | 266 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) |
267 | ArrayList errors = new ArrayList(); | 267 | ArrayList errors = new ArrayList(); |
@@ -1005,7 +1005,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | group.RemoveInventoryItem(localID, itemID); | 1007 | group.RemoveInventoryItem(localID, itemID); |
1008 | part.GetProperties(remoteClient); | 1008 | part.SendPropertiesToClient(remoteClient); |
1009 | } | 1009 | } |
1010 | } | 1010 | } |
1011 | 1011 | ||
@@ -1283,7 +1283,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1283 | 1283 | ||
1284 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) | 1284 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) |
1285 | { | 1285 | { |
1286 | destPart.GetProperties(avatar.ControllingClient); | 1286 | destPart.SendPropertiesToClient(avatar.ControllingClient); |
1287 | } | 1287 | } |
1288 | } | 1288 | } |
1289 | 1289 | ||
@@ -1446,7 +1446,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1446 | m_log.InfoFormat( | 1446 | m_log.InfoFormat( |
1447 | "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", | 1447 | "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", |
1448 | item.Name, primLocalID, remoteClient.Name); | 1448 | item.Name, primLocalID, remoteClient.Name); |
1449 | part.GetProperties(remoteClient); | 1449 | part.SendPropertiesToClient(remoteClient); |
1450 | if (!Permissions.BypassPermissions()) | 1450 | if (!Permissions.BypassPermissions()) |
1451 | { | 1451 | { |
1452 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | 1452 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) |
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1534 | 1534 | ||
1535 | if (part.Inventory.UpdateInventoryItem(itemInfo)) | 1535 | if (part.Inventory.UpdateInventoryItem(itemInfo)) |
1536 | { | 1536 | { |
1537 | part.GetProperties(remoteClient); | 1537 | part.SendPropertiesToClient(remoteClient); |
1538 | } | 1538 | } |
1539 | } | 1539 | } |
1540 | } | 1540 | } |
@@ -1586,7 +1586,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1586 | // m_log.InfoFormat("[PRIMINVENTORY]: " + | 1586 | // m_log.InfoFormat("[PRIMINVENTORY]: " + |
1587 | // "Rezzed script {0} into prim local ID {1} for user {2}", | 1587 | // "Rezzed script {0} into prim local ID {1} for user {2}", |
1588 | // item.inventoryName, localID, remoteClient.Name); | 1588 | // item.inventoryName, localID, remoteClient.Name); |
1589 | part.GetProperties(remoteClient); | 1589 | part.SendPropertiesToClient(remoteClient); |
1590 | part.ParentGroup.ResumeScripts(); | 1590 | part.ParentGroup.ResumeScripts(); |
1591 | } | 1591 | } |
1592 | else | 1592 | else |
@@ -1644,7 +1644,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1644 | taskItem.AssetID = asset.FullID; | 1644 | taskItem.AssetID = asset.FullID; |
1645 | 1645 | ||
1646 | part.Inventory.AddInventoryItem(taskItem, false); | 1646 | part.Inventory.AddInventoryItem(taskItem, false); |
1647 | part.GetProperties(remoteClient); | 1647 | part.SendPropertiesToClient(remoteClient); |
1648 | 1648 | ||
1649 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); | 1649 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); |
1650 | part.ParentGroup.ResumeScripts(); | 1650 | part.ParentGroup.ResumeScripts(); |
@@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1758 | 1758 | ||
1759 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) | 1759 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) |
1760 | { | 1760 | { |
1761 | destPart.GetProperties(avatar.ControllingClient); | 1761 | destPart.SendPropertiesToClient(avatar.ControllingClient); |
1762 | } | 1762 | } |
1763 | } | 1763 | } |
1764 | 1764 | ||
@@ -2217,7 +2217,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2217 | SceneObjectPart part = GetSceneObjectPart(localID); | 2217 | SceneObjectPart part = GetSceneObjectPart(localID); |
2218 | if (part == null) | 2218 | if (part == null) |
2219 | continue; | 2219 | continue; |
2220 | part.GetProperties(remoteClient); | 2220 | part.SendPropertiesToClient(remoteClient); |
2221 | } | 2221 | } |
2222 | } | 2222 | } |
2223 | 2223 | ||