aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
authorlbsa712007-09-24 07:30:30 +0000
committerlbsa712007-09-24 07:30:30 +0000
commit1302ef44e3c632159378bc4042c753bcf36e9c63 (patch)
tree6b6295ac233ecb05afe6432a903ec616e4fa079a /OpenSim/Framework/Communications/Cache
parent* Trying to streamline CommunicationsManager (diff)
downloadopensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.zip
opensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.tar.gz
opensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.tar.bz2
opensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.tar.xz
* Started major restructusing of comms to prepare for better grid and region functionality
* Working towards one shared set of services * Killed off two projects with very little functionality
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCache.cs6
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index 59a9e00..d0507d0 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -316,7 +316,7 @@ namespace OpenSim.Framework.Communications.Caches
316 { 316 {
317 //really need to fix this call, if lbsa71 saw this he would die. 317 //really need to fix this call, if lbsa71 saw this he would die.
318 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset); 318 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
319 CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId); 319 CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfileCache.GetUserDetails(ourClient.AgentId);
320 if (userInfo != null) 320 if (userInfo != null)
321 { 321 {
322 InventoryItemBase item = new InventoryItemBase(); 322 InventoryItemBase item = new InventoryItemBase();
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index acdb6db..99dc45a 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications.Caches
101 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) 101 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
102 { 102 {
103 this.ItemReceive(userID, itemInfo); 103 this.ItemReceive(userID, itemInfo);
104 this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo); 104 this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
105 } 105 }
106 } 106 }
107 107
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Communications.Caches
109 { 109 {
110 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) 110 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
111 { 111 {
112 this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo); 112 this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
113 } 113 }
114 } 114 }
115 115
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Communications.Caches
121 result = RootFolder.DeleteItem(item.inventoryID); 121 result = RootFolder.DeleteItem(item.inventoryID);
122 if (result) 122 if (result)
123 { 123 {
124 this.m_parentCommsManager.InventoryServer.DeleteInventoryItem(userID, item); 124 this.m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item);
125 } 125 }
126 } 126 }
127 return result; 127 return result;
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 0c8c0f9..390b938 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Caches
106 InventoryFolder createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType); 106 InventoryFolder createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
107 if (createdFolder != null) 107 if (createdFolder != null)
108 { 108 {
109 this.m_parent.InventoryServer.AddNewInventoryFolder(remoteClient.AgentId, createdFolder); 109 this.m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
110 } 110 }
111 } 111 }
112 else 112 else
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Communications.Caches
181 /// <param name="userID"></param> 181 /// <param name="userID"></param>
182 private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo) 182 private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
183 { 183 {
184 this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive); 184 this.m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
185 } 185 }
186 186
187 /// <summary> 187 /// <summary>
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications.Caches
190 /// <param name="userID"></param> 190 /// <param name="userID"></param>
191 private UserProfileData RequestUserProfileForUser(LLUUID userID) 191 private UserProfileData RequestUserProfileForUser(LLUUID userID)
192 { 192 {
193 return this.m_parent.UserServer.GetUserProfile(userID); 193 return this.m_parent.UserService.GetUserProfile(userID);
194 } 194 }
195 195
196 /// <summary> 196 /// <summary>