diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index a6e47f3..81c0b73 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -27,7 +27,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
27 | 27 | ||
28 | public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) | 28 | public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) |
29 | { | 29 | { |
30 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); | 30 | CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); |
31 | if (userInfo != null) | 31 | if (userInfo != null) |
32 | { | 32 | { |
33 | userInfo.AddItem(remoteClient.AgentId, item); | 33 | userInfo.AddItem(remoteClient.AgentId, item); |
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
49 | 49 | ||
50 | public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) | 50 | public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) |
51 | { | 51 | { |
52 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); | 52 | CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); |
53 | if (userInfo != null) | 53 | if (userInfo != null) |
54 | { | 54 | { |
55 | if (userInfo.RootFolder != null) | 55 | if (userInfo.RootFolder != null) |
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
89 | public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, | 89 | public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, |
90 | LLUUID itemID) | 90 | LLUUID itemID) |
91 | { | 91 | { |
92 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); | 92 | CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); |
93 | if (userInfo != null) | 93 | if (userInfo != null) |
94 | { | 94 | { |
95 | if (userInfo.RootFolder != null) | 95 | if (userInfo.RootFolder != null) |
@@ -154,7 +154,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
154 | { | 154 | { |
155 | if (transActionID == LLUUID.Zero) | 155 | if (transActionID == LLUUID.Zero) |
156 | { | 156 | { |
157 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); | 157 | CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); |
158 | if (userInfo != null) | 158 | if (userInfo != null) |
159 | { | 159 | { |
160 | AssetBase asset = new AssetBase(); | 160 | AssetBase asset = new AssetBase(); |
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
244 | 244 | ||
245 | public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) | 245 | public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) |
246 | { | 246 | { |
247 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); | 247 | CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); |
248 | LLUUID copyID = LLUUID.Random(); | 248 | LLUUID copyID = LLUUID.Random(); |
249 | if (userInfo != null) | 249 | if (userInfo != null) |
250 | { | 250 | { |
@@ -335,7 +335,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
335 | if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) | 335 | if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) |
336 | { | 336 | { |
337 | string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); | 337 | string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); |
338 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); | 338 | CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); |
339 | if (userInfo != null) | 339 | if (userInfo != null) |
340 | { | 340 | { |
341 | AssetBase asset = new AssetBase(); | 341 | AssetBase asset = new AssetBase(); |
@@ -391,7 +391,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
391 | 391 | ||
392 | public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) | 392 | public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) |
393 | { | 393 | { |
394 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); | 394 | CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); |
395 | if (userInfo != null) | 395 | if (userInfo != null) |
396 | { | 396 | { |
397 | if (userInfo.RootFolder != null) | 397 | if (userInfo.RootFolder != null) |