diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index c3f51da..6f11d60 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
105 | { | 105 | { |
106 | if (userProfile.RootFolder != null) | 106 | if (userProfile.RootFolder != null) |
107 | { | 107 | { |
108 | if (userProfile.RootFolder.folderID == parentID) | 108 | if (userProfile.RootFolder.ID == parentID) |
109 | { | 109 | { |
110 | InventoryFolderImpl createdFolder = | 110 | InventoryFolderImpl createdFolder = |
111 | userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType); | 111 | userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType); |
@@ -113,12 +113,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
113 | if (createdFolder != null) | 113 | if (createdFolder != null) |
114 | { | 114 | { |
115 | InventoryFolderBase createdBaseFolder = new InventoryFolderBase(); | 115 | InventoryFolderBase createdBaseFolder = new InventoryFolderBase(); |
116 | createdBaseFolder.agentID = createdFolder.agentID; | 116 | createdBaseFolder.AgentID = createdFolder.AgentID; |
117 | createdBaseFolder.folderID = createdFolder.folderID; | 117 | createdBaseFolder.ID = createdFolder.ID; |
118 | createdBaseFolder.name = createdFolder.name; | 118 | createdBaseFolder.Name = createdFolder.Name; |
119 | createdBaseFolder.parentID = createdFolder.parentID; | 119 | createdBaseFolder.ParentID = createdFolder.ParentID; |
120 | createdBaseFolder.type = createdFolder.type; | 120 | createdBaseFolder.Type = createdFolder.Type; |
121 | createdBaseFolder.version = createdFolder.version; | 121 | createdBaseFolder.Version = createdFolder.Version; |
122 | m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder); | 122 | m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder); |
123 | } | 123 | } |
124 | } | 124 | } |
@@ -156,12 +156,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
156 | if (userProfile.RootFolder != null) | 156 | if (userProfile.RootFolder != null) |
157 | { | 157 | { |
158 | InventoryFolderBase baseFolder = new InventoryFolderBase(); | 158 | InventoryFolderBase baseFolder = new InventoryFolderBase(); |
159 | baseFolder.agentID = remoteClient.AgentId; | 159 | baseFolder.AgentID = remoteClient.AgentId; |
160 | baseFolder.folderID = folderID; | 160 | baseFolder.ID = folderID; |
161 | baseFolder.name = name; | 161 | baseFolder.Name = name; |
162 | baseFolder.parentID = parentID; | 162 | baseFolder.ParentID = parentID; |
163 | baseFolder.type = (short) type; | 163 | baseFolder.Type = (short) type; |
164 | baseFolder.version = userProfile.RootFolder.version; | 164 | baseFolder.Version = userProfile.RootFolder.Version; |
165 | m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, baseFolder); | 165 | m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, baseFolder); |
166 | } | 166 | } |
167 | } | 167 | } |
@@ -176,9 +176,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
176 | if (userProfile.RootFolder != null) | 176 | if (userProfile.RootFolder != null) |
177 | { | 177 | { |
178 | InventoryFolderBase baseFolder = new InventoryFolderBase(); | 178 | InventoryFolderBase baseFolder = new InventoryFolderBase(); |
179 | baseFolder.agentID = remoteClient.AgentId; | 179 | baseFolder.AgentID = remoteClient.AgentId; |
180 | baseFolder.folderID = folderID; | 180 | baseFolder.ID = folderID; |
181 | baseFolder.parentID = parentID; | 181 | baseFolder.ParentID = parentID; |
182 | m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder); | 182 | m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder); |
183 | } | 183 | } |
184 | } | 184 | } |
@@ -199,10 +199,10 @@ namespace OpenSim.Framework.Communications.Cache | |||
199 | // XXX We're not handling sortOrder yet! | 199 | // XXX We're not handling sortOrder yet! |
200 | 200 | ||
201 | InventoryFolderImpl fold = null; | 201 | InventoryFolderImpl fold = null; |
202 | if (folderID == libraryRoot.folderID) | 202 | if (folderID == libraryRoot.ID) |
203 | { | 203 | { |
204 | remoteClient.SendInventoryFolderDetails( | 204 | remoteClient.SendInventoryFolderDetails( |
205 | libraryRoot.agentID, libraryRoot.folderID, libraryRoot.RequestListOfItems(), | 205 | libraryRoot.AgentID, libraryRoot.ID, libraryRoot.RequestListOfItems(), |
206 | libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems); | 206 | libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems); |
207 | 207 | ||
208 | return; | 208 | return; |
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
211 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) | 211 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) |
212 | { | 212 | { |
213 | remoteClient.SendInventoryFolderDetails( | 213 | remoteClient.SendInventoryFolderDetails( |
214 | libraryRoot.agentID, folderID, fold.RequestListOfItems(), | 214 | libraryRoot.AgentID, folderID, fold.RequestListOfItems(), |
215 | fold.RequestListOfFolders(), fetchFolders, fetchItems); | 215 | fold.RequestListOfFolders(), fetchFolders, fetchItems); |
216 | 216 | ||
217 | return; | 217 | return; |
@@ -242,7 +242,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
242 | 242 | ||
243 | if (userProfile.RootFolder != null) | 243 | if (userProfile.RootFolder != null) |
244 | { | 244 | { |
245 | if (userProfile.RootFolder.folderID == folderID) | 245 | if (userProfile.RootFolder.ID == folderID) |
246 | { | 246 | { |
247 | // m_log.DebugFormat( | 247 | // m_log.DebugFormat( |
248 | // "[AGENT INVENTORY]: Found root folder {0} for client {1}", | 248 | // "[AGENT INVENTORY]: Found root folder {0} for client {1}", |
@@ -301,7 +301,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
301 | // if (fetchItems) | 301 | // if (fetchItems) |
302 | // { | 302 | // { |
303 | InventoryFolderImpl fold = null; | 303 | InventoryFolderImpl fold = null; |
304 | if (folderID == libraryRoot.folderID) | 304 | if (folderID == libraryRoot.ID) |
305 | { | 305 | { |
306 | return libraryRoot.RequestListOfItems(); | 306 | return libraryRoot.RequestListOfItems(); |
307 | } | 307 | } |
@@ -316,7 +316,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
316 | { | 316 | { |
317 | if (userProfile.RootFolder != null) | 317 | if (userProfile.RootFolder != null) |
318 | { | 318 | { |
319 | if (userProfile.RootFolder.folderID == folderID) | 319 | if (userProfile.RootFolder.ID == folderID) |
320 | { | 320 | { |
321 | return userProfile.RootFolder.RequestListOfItems(); | 321 | return userProfile.RootFolder.RequestListOfItems(); |
322 | } | 322 | } |
@@ -377,7 +377,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
377 | 377 | ||
378 | public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) | 378 | public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) |
379 | { | 379 | { |
380 | if (ownerID == libraryRoot.agentID) | 380 | if (ownerID == libraryRoot.AgentID) |
381 | { | 381 | { |
382 | //Console.WriteLine("request info for library item"); | 382 | //Console.WriteLine("request info for library item"); |
383 | 383 | ||