diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
4 files changed, 68 insertions, 68 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index cb1eb5a..e39333b 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
60 | /// <param name="folder"></param> | 60 | /// <param name="folder"></param> |
61 | private void AddPendingFolder(InventoryFolderImpl folder) | 61 | private void AddPendingFolder(InventoryFolderImpl folder) |
62 | { | 62 | { |
63 | LLUUID parentFolderId = folder.parentID; | 63 | LLUUID parentFolderId = folder.ParentID; |
64 | 64 | ||
65 | if (pendingCategorizationFolders.ContainsKey(parentFolderId)) | 65 | if (pendingCategorizationFolders.ContainsKey(parentFolderId)) |
66 | { | 66 | { |
@@ -83,17 +83,17 @@ namespace OpenSim.Framework.Communications.Cache | |||
83 | /// </param> | 83 | /// </param> |
84 | private void ResolvePendingFolders(InventoryFolderImpl parent) | 84 | private void ResolvePendingFolders(InventoryFolderImpl parent) |
85 | { | 85 | { |
86 | if (pendingCategorizationFolders.ContainsKey(parent.folderID)) | 86 | if (pendingCategorizationFolders.ContainsKey(parent.ID)) |
87 | { | 87 | { |
88 | foreach (InventoryFolderImpl folder in pendingCategorizationFolders[parent.folderID]) | 88 | foreach (InventoryFolderImpl folder in pendingCategorizationFolders[parent.ID]) |
89 | { | 89 | { |
90 | // m_log.DebugFormat( | 90 | // m_log.DebugFormat( |
91 | // "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}", | 91 | // "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}", |
92 | // folder.name, folder.folderID, parent.name, parent.folderID); | 92 | // folder.name, folder.folderID, parent.name, parent.folderID); |
93 | 93 | ||
94 | if (!parent.SubFolders.ContainsKey(folder.folderID)) | 94 | if (!parent.SubFolders.ContainsKey(folder.ID)) |
95 | { | 95 | { |
96 | parent.SubFolders.Add(folder.folderID, folder); | 96 | parent.SubFolders.Add(folder.ID, folder); |
97 | } | 97 | } |
98 | } | 98 | } |
99 | } | 99 | } |
@@ -118,16 +118,16 @@ namespace OpenSim.Framework.Communications.Cache | |||
118 | { | 118 | { |
119 | if (RootFolder == null) | 119 | if (RootFolder == null) |
120 | { | 120 | { |
121 | if (folderInfo.parentID == LLUUID.Zero) | 121 | if (folderInfo.ParentID == LLUUID.Zero) |
122 | { | 122 | { |
123 | RootFolder = folderInfo; | 123 | RootFolder = folderInfo; |
124 | } | 124 | } |
125 | } | 125 | } |
126 | else if (RootFolder.folderID == folderInfo.parentID) | 126 | else if (RootFolder.ID == folderInfo.ParentID) |
127 | { | 127 | { |
128 | if (!RootFolder.SubFolders.ContainsKey(folderInfo.folderID)) | 128 | if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID)) |
129 | { | 129 | { |
130 | RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo); | 130 | RootFolder.SubFolders.Add(folderInfo.ID, folderInfo); |
131 | } | 131 | } |
132 | else | 132 | else |
133 | { | 133 | { |
@@ -136,12 +136,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
136 | } | 136 | } |
137 | else | 137 | else |
138 | { | 138 | { |
139 | InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.parentID); | 139 | InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.ParentID); |
140 | if (folder != null) | 140 | if (folder != null) |
141 | { | 141 | { |
142 | if (!folder.SubFolders.ContainsKey(folderInfo.folderID)) | 142 | if (!folder.SubFolders.ContainsKey(folderInfo.ID)) |
143 | { | 143 | { |
144 | folder.SubFolders.Add(folderInfo.folderID, folderInfo); | 144 | folder.SubFolders.Add(folderInfo.ID, folderInfo); |
145 | } | 145 | } |
146 | } | 146 | } |
147 | else | 147 | else |
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
171 | { | 171 | { |
172 | if ((userID == UserProfile.UUID) && (RootFolder != null)) | 172 | if ((userID == UserProfile.UUID) && (RootFolder != null)) |
173 | { | 173 | { |
174 | if (itemInfo.Folder == RootFolder.folderID) | 174 | if (itemInfo.Folder == RootFolder.ID) |
175 | { | 175 | { |
176 | if (!RootFolder.Items.ContainsKey(itemInfo.ID)) | 176 | if (!RootFolder.Items.ContainsKey(itemInfo.ID)) |
177 | { | 177 | { |
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs index 20edf51..37907a0 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | |||
@@ -45,12 +45,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
45 | // Constructors | 45 | // Constructors |
46 | public InventoryFolderImpl(InventoryFolderBase folderbase) | 46 | public InventoryFolderImpl(InventoryFolderBase folderbase) |
47 | { | 47 | { |
48 | agentID = folderbase.agentID; | 48 | AgentID = folderbase.AgentID; |
49 | folderID = folderbase.folderID; | 49 | ID = folderbase.ID; |
50 | name = folderbase.name; | 50 | Name = folderbase.Name; |
51 | parentID = folderbase.parentID; | 51 | ParentID = folderbase.ParentID; |
52 | type = folderbase.type; | 52 | Type = folderbase.Type; |
53 | version = folderbase.version; | 53 | Version = folderbase.Version; |
54 | } | 54 | } |
55 | 55 | ||
56 | public InventoryFolderImpl() | 56 | public InventoryFolderImpl() |
@@ -63,12 +63,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
63 | if (!SubFolders.ContainsKey(folderID)) | 63 | if (!SubFolders.ContainsKey(folderID)) |
64 | { | 64 | { |
65 | InventoryFolderImpl subFold = new InventoryFolderImpl(); | 65 | InventoryFolderImpl subFold = new InventoryFolderImpl(); |
66 | subFold.name = folderName; | 66 | subFold.Name = folderName; |
67 | subFold.folderID = folderID; | 67 | subFold.ID = folderID; |
68 | subFold.type = (short) type; | 68 | subFold.Type = (short) type; |
69 | subFold.parentID = this.folderID; | 69 | subFold.ParentID = this.ID; |
70 | subFold.agentID = agentID; | 70 | subFold.AgentID = AgentID; |
71 | SubFolders.Add(subFold.folderID, subFold); | 71 | SubFolders.Add(subFold.ID, subFold); |
72 | return subFold; | 72 | return subFold; |
73 | } | 73 | } |
74 | return null; | 74 | return null; |
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 12a07eb..cb82850 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -56,14 +56,14 @@ namespace OpenSim.Framework.Communications.Cache | |||
56 | { | 56 | { |
57 | m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); | 57 | m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); |
58 | 58 | ||
59 | agentID = libOwner; | 59 | AgentID = libOwner; |
60 | folderID = new LLUUID("00000112-000f-0000-0000-000100bba000"); | 60 | ID = new LLUUID("00000112-000f-0000-0000-000100bba000"); |
61 | name = "OpenSim Library"; | 61 | Name = "OpenSim Library"; |
62 | parentID = LLUUID.Zero; | 62 | ParentID = LLUUID.Zero; |
63 | type = (short) 8; | 63 | Type = (short) 8; |
64 | version = (ushort) 1; | 64 | Version = (ushort) 1; |
65 | 65 | ||
66 | libraryFolders.Add(folderID, this); | 66 | libraryFolders.Add(ID, this); |
67 | 67 | ||
68 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); | 68 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); |
69 | 69 | ||
@@ -172,20 +172,20 @@ namespace OpenSim.Framework.Communications.Cache | |||
172 | { | 172 | { |
173 | InventoryFolderImpl folderInfo = new InventoryFolderImpl(); | 173 | InventoryFolderImpl folderInfo = new InventoryFolderImpl(); |
174 | 174 | ||
175 | folderInfo.folderID = new LLUUID(config.GetString("folderID", folderID.ToString())); | 175 | folderInfo.ID = new LLUUID(config.GetString("folderID", ID.ToString())); |
176 | folderInfo.name = config.GetString("name", "unknown"); | 176 | folderInfo.Name = config.GetString("name", "unknown"); |
177 | folderInfo.parentID = new LLUUID(config.GetString("parentFolderID", folderID.ToString())); | 177 | folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString())); |
178 | folderInfo.type = (short)config.GetInt("type", 8); | 178 | folderInfo.Type = (short)config.GetInt("type", 8); |
179 | 179 | ||
180 | folderInfo.agentID = libOwner; | 180 | folderInfo.AgentID = libOwner; |
181 | folderInfo.version = 1; | 181 | folderInfo.Version = 1; |
182 | 182 | ||
183 | if (libraryFolders.ContainsKey(folderInfo.parentID)) | 183 | if (libraryFolders.ContainsKey(folderInfo.ParentID)) |
184 | { | 184 | { |
185 | InventoryFolderImpl parentFolder = libraryFolders[folderInfo.parentID]; | 185 | InventoryFolderImpl parentFolder = libraryFolders[folderInfo.ParentID]; |
186 | 186 | ||
187 | libraryFolders.Add(folderInfo.folderID, folderInfo); | 187 | libraryFolders.Add(folderInfo.ID, folderInfo); |
188 | parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); | 188 | parentFolder.SubFolders.Add(folderInfo.ID, folderInfo); |
189 | 189 | ||
190 | // m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID); | 190 | // m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID); |
191 | } | 191 | } |
@@ -193,7 +193,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
193 | { | 193 | { |
194 | m_log.WarnFormat( | 194 | m_log.WarnFormat( |
195 | "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!", | 195 | "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!", |
196 | folderInfo.name, folderInfo.folderID, folderInfo.parentID); | 196 | folderInfo.Name, folderInfo.ID, folderInfo.ParentID); |
197 | } | 197 | } |
198 | } | 198 | } |
199 | 199 | ||
@@ -206,9 +206,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
206 | InventoryItemBase item = new InventoryItemBase(); | 206 | InventoryItemBase item = new InventoryItemBase(); |
207 | item.Owner = libOwner; | 207 | item.Owner = libOwner; |
208 | item.Creator = libOwner; | 208 | item.Creator = libOwner; |
209 | item.ID = new LLUUID(config.GetString("inventoryID", folderID.ToString())); | 209 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); |
210 | item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); | 210 | item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); |
211 | item.Folder = new LLUUID(config.GetString("folderID", folderID.ToString())); | 211 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); |
212 | item.Description = config.GetString("description", System.String.Empty); | 212 | item.Description = config.GetString("description", System.String.Empty); |
213 | item.Name = config.GetString("name", System.String.Empty); | 213 | item.Name = config.GetString("name", System.String.Empty); |
214 | item.AssetType = config.GetInt("assetType", 0); | 214 | item.AssetType = config.GetInt("assetType", 0); |
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 | ||