diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index c662a6b..31c0be1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
132 | { | 132 | { |
133 | ScenePresence avatar; | 133 | ScenePresence avatar; |
134 | 134 | ||
135 | if (TryGetAvatar(avatarId, out avatar)) | 135 | if (TryGetScenePresence(avatarId, out avatar)) |
136 | { | 136 | { |
137 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); | 137 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); |
138 | if (invAccess != null) | 138 | if (invAccess != null) |
@@ -230,7 +230,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
230 | { | 230 | { |
231 | ScenePresence avatar; | 231 | ScenePresence avatar; |
232 | 232 | ||
233 | if (TryGetAvatar(avatarId, out avatar)) | 233 | if (TryGetScenePresence(avatarId, out avatar)) |
234 | { | 234 | { |
235 | return CapsUpdateTaskInventoryScriptAsset( | 235 | return CapsUpdateTaskInventoryScriptAsset( |
236 | avatar.ControllingClient, itemId, primId, isScriptRunning, data); | 236 | avatar.ControllingClient, itemId, primId, isScriptRunning, data); |
@@ -683,7 +683,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
683 | if (transactionID == UUID.Zero) | 683 | if (transactionID == UUID.Zero) |
684 | { | 684 | { |
685 | ScenePresence presence; | 685 | ScenePresence presence; |
686 | if (TryGetAvatar(remoteClient.AgentId, out presence)) | 686 | if (TryGetScenePresence(remoteClient.AgentId, out presence)) |
687 | { | 687 | { |
688 | byte[] data = null; | 688 | byte[] data = null; |
689 | 689 | ||
@@ -941,7 +941,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
941 | { | 941 | { |
942 | ScenePresence avatar; | 942 | ScenePresence avatar; |
943 | 943 | ||
944 | if (TryGetAvatar(avatarId, out avatar)) | 944 | if (TryGetScenePresence(avatarId, out avatar)) |
945 | { | 945 | { |
946 | return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId); | 946 | return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId); |
947 | } | 947 | } |
@@ -1055,7 +1055,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1055 | 1055 | ||
1056 | ScenePresence avatar; | 1056 | ScenePresence avatar; |
1057 | 1057 | ||
1058 | if (TryGetAvatar(srcTaskItem.OwnerID, out avatar)) | 1058 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) |
1059 | { | 1059 | { |
1060 | destPart.GetProperties(avatar.ControllingClient); | 1060 | destPart.GetProperties(avatar.ControllingClient); |
1061 | } | 1061 | } |
@@ -1083,7 +1083,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | ScenePresence avatar = null; | 1085 | ScenePresence avatar = null; |
1086 | if (TryGetAvatar(destID, out avatar)) | 1086 | if (TryGetScenePresence(destID, out avatar)) |
1087 | { | 1087 | { |
1088 | //profile.SendInventoryDecendents(avatar.ControllingClient, | 1088 | //profile.SendInventoryDecendents(avatar.ControllingClient, |
1089 | // profile.RootFolder.ID, true, false); | 1089 | // profile.RootFolder.ID, true, false); |
@@ -1420,7 +1420,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1420 | 1420 | ||
1421 | ScenePresence avatar; | 1421 | ScenePresence avatar; |
1422 | 1422 | ||
1423 | if (TryGetAvatar(srcTaskItem.OwnerID, out avatar)) | 1423 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) |
1424 | { | 1424 | { |
1425 | destPart.GetProperties(avatar.ControllingClient); | 1425 | destPart.GetProperties(avatar.ControllingClient); |
1426 | } | 1426 | } |
@@ -1861,7 +1861,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1861 | UUID inventoryID = part.ParentGroup.GetFromItemID(); | 1861 | UUID inventoryID = part.ParentGroup.GetFromItemID(); |
1862 | 1862 | ||
1863 | ScenePresence presence; | 1863 | ScenePresence presence; |
1864 | if (TryGetAvatar(remoteClient.AgentId, out presence)) | 1864 | if (TryGetScenePresence(remoteClient.AgentId, out presence)) |
1865 | { | 1865 | { |
1866 | if (!Permissions.CanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) | 1866 | if (!Permissions.CanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) |
1867 | return; | 1867 | return; |