aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs20
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 759d070..6370bcb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Scenes
53 53
54 public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) 54 public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
55 { 55 {
56 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 56 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
57 if (userInfo != null) 57 if (userInfo != null)
58 { 58 {
59 userInfo.AddItem(remoteClient.AgentId, item); 59 userInfo.AddItem(remoteClient.AgentId, item);
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Environment.Scenes
75 75
76 public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) 76 public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data)
77 { 77 {
78 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 78 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
79 if (userInfo != null) 79 if (userInfo != null)
80 { 80 {
81 if (userInfo.RootFolder != null) 81 if (userInfo.RootFolder != null)
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes
109 public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, 109 public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID,
110 LLUUID itemID) 110 LLUUID itemID)
111 { 111 {
112 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 112 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
113 if (userInfo != null) 113 if (userInfo != null)
114 { 114 {
115 if (userInfo.RootFolder != null) 115 if (userInfo.RootFolder != null)
@@ -157,10 +157,10 @@ namespace OpenSim.Region.Environment.Scenes
157 157
158 public void CopyInventoryItem(IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID, LLUUID newFolderID, string newName) 158 public void CopyInventoryItem(IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID, LLUUID newFolderID, string newName)
159 { 159 {
160 InventoryItemBase item = CommsManager.UserProfileCache.libraryRoot.HasItem(oldItemID); 160 InventoryItemBase item = CommsManager.UserProfileCacheService.libraryRoot.HasItem(oldItemID);
161 if (item == null) 161 if (item == null)
162 { 162 {
163 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(oldAgentID); 163 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(oldAgentID);
164 if (userInfo == null) 164 if (userInfo == null)
165 { 165 {
166 MainLog.Instance.Warn("INVENTORY", "Failed to find user " + oldAgentID.ToString()); 166 MainLog.Instance.Warn("INVENTORY", "Failed to find user " + oldAgentID.ToString());
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Scenes
212 private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID, 212 private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID,
213 AssetBase asset, uint nextOwnerMask) 213 AssetBase asset, uint nextOwnerMask)
214 { 214 {
215 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 215 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
216 if (userInfo != null) 216 if (userInfo != null)
217 { 217 {
218 InventoryItemBase item = new InventoryItemBase(); 218 InventoryItemBase item = new InventoryItemBase();
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Environment.Scenes
252 { 252 {
253 if (transActionID == LLUUID.Zero) 253 if (transActionID == LLUUID.Zero)
254 { 254 {
255 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 255 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
256 if (userInfo != null) 256 if (userInfo != null)
257 { 257 {
258 AssetBase asset = CreateAsset(name, description, invType, assetType, null); 258 AssetBase asset = CreateAsset(name, description, invType, assetType, null);
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Environment.Scenes
320 320
321 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) 321 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
322 { 322 {
323 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 323 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
324 LLUUID copyID = LLUUID.Random(); 324 LLUUID copyID = LLUUID.Random();
325 if (userInfo != null) 325 if (userInfo != null)
326 { 326 {
@@ -398,7 +398,7 @@ namespace OpenSim.Region.Environment.Scenes
398 if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) 398 if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID))
399 { 399 {
400 string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); 400 string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString();
401 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 401 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
402 if (userInfo != null) 402 if (userInfo != null)
403 { 403 {
404 AssetBase asset = CreateAsset( 404 AssetBase asset = CreateAsset(
@@ -454,7 +454,7 @@ namespace OpenSim.Region.Environment.Scenes
454 454
455 public virtual void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) 455 public virtual void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos)
456 { 456 {
457 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 457 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
458 if (userInfo != null) 458 if (userInfo != null)
459 { 459 {
460 if (userInfo.RootFolder != null) 460 if (userInfo.RootFolder != null)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ade0e35..19e0064 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -949,7 +949,7 @@ namespace OpenSim.Region.Environment.Scenes
949 CreateAndAddScenePresence(client, child); 949 CreateAndAddScenePresence(client, child);
950 950
951 m_LandManager.sendParcelOverlay(client); 951 m_LandManager.sendParcelOverlay(client);
952 CommsManager.UserProfileCache.AddNewUser(client.AgentId); 952 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
953 CommsManager.TransactionsManager.AddUser(client.AgentId); 953 CommsManager.TransactionsManager.AddUser(client.AgentId);
954 } 954 }
955 955
@@ -999,10 +999,10 @@ namespace OpenSim.Region.Environment.Scenes
999 client.OnGodKickUser += handleGodlikeKickUser; 999 client.OnGodKickUser += handleGodlikeKickUser;
1000 1000
1001 client.OnCreateNewInventoryItem += CreateNewInventoryItem; 1001 client.OnCreateNewInventoryItem += CreateNewInventoryItem;
1002 client.OnCreateNewInventoryFolder += CommsManager.UserProfileCache.HandleCreateInventoryFolder; 1002 client.OnCreateNewInventoryFolder += CommsManager.UserProfileCacheService.HandleCreateInventoryFolder;
1003 client.OnFetchInventoryDescendents += CommsManager.UserProfileCache.HandleFecthInventoryDescendents; 1003 client.OnFetchInventoryDescendents += CommsManager.UserProfileCacheService.HandleFecthInventoryDescendents;
1004 client.OnRequestTaskInventory += RequestTaskInventory; 1004 client.OnRequestTaskInventory += RequestTaskInventory;
1005 client.OnFetchInventory += CommsManager.UserProfileCache.HandleFetchInventory; 1005 client.OnFetchInventory += CommsManager.UserProfileCacheService.HandleFetchInventory;
1006 client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset; 1006 client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset;
1007 client.OnCopyInventoryItem += CopyInventoryItem; 1007 client.OnCopyInventoryItem += CopyInventoryItem;
1008 client.OnAssetUploadRequest += CommsManager.TransactionsManager.HandleUDPUploadRequest; 1008 client.OnAssetUploadRequest += CommsManager.TransactionsManager.HandleUDPUploadRequest;