aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/InventoryServiceBase.cs
diff options
context:
space:
mode:
authorSean Dague2008-04-07 23:27:05 +0000
committerSean Dague2008-04-07 23:27:05 +0000
commit5ee75998ce4d941efd937848d28f3a4dac6ba6cc (patch)
treef29a100cb8ab3715c82f0aec4fee9f968f210405 /OpenSim/Framework/Communications/InventoryServiceBase.cs
parentRefactor InventoryItemBase to do the following: (diff)
downloadopensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.zip
opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.gz
opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.bz2
opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.xz
more refactoring, this time on InventoryFolderBase
* wrap attributes in properties * clean up names a little bit * clean up name styles
Diffstat (limited to 'OpenSim/Framework/Communications/InventoryServiceBase.cs')
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs216
1 files changed, 108 insertions, 108 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index f41bd27..4abfc5a 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Communications
95 95
96 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) 96 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
97 { 97 {
98 IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID); 98 IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.ID);
99 userFolders.AddRange(folders); 99 userFolders.AddRange(folders);
100 } 100 }
101 101
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications
190 protected void AddFolder(InventoryFolderBase folder) 190 protected void AddFolder(InventoryFolderBase folder)
191 { 191 {
192 m_log.DebugFormat( 192 m_log.DebugFormat(
193 "[INVENTORY SERVICE BASE]: Adding folder {0}, {1} to {2}", folder.name, folder.folderID, folder.parentID); 193 "[INVENTORY SERVICE BASE]: Adding folder {0}, {1} to {2}", folder.Name, folder.ID, folder.ParentID);
194 194
195 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) 195 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
196 { 196 {
@@ -239,141 +239,141 @@ namespace OpenSim.Framework.Communications
239 { 239 {
240 InventoryFolderBase folder = new InventoryFolderBase(); 240 InventoryFolderBase folder = new InventoryFolderBase();
241 241
242 folder.parentID = LLUUID.Zero; 242 folder.ParentID = LLUUID.Zero;
243 folder.agentID = user; 243 folder.AgentID = user;
244 folder.folderID = LLUUID.Random(); 244 folder.ID = LLUUID.Random();
245 folder.name = "My Inventory"; 245 folder.Name = "My Inventory";
246 folder.type = (short)AssetType.Folder; 246 folder.Type = (short)AssetType.Folder;
247 folder.version = 1; 247 folder.Version = 1;
248 Folders.Add(folder.folderID, folder); 248 Folders.Add(folder.ID, folder);
249 249
250 LLUUID rootFolder = folder.folderID; 250 LLUUID rootFolder = folder.ID;
251 251
252 folder = new InventoryFolderBase(); 252 folder = new InventoryFolderBase();
253 folder.parentID = rootFolder; 253 folder.ParentID = rootFolder;
254 folder.agentID = user; 254 folder.AgentID = user;
255 folder.folderID = LLUUID.Random(); 255 folder.ID = LLUUID.Random();
256 folder.name = "Animations"; 256 folder.Name = "Animations";
257 folder.type = (short)AssetType.Animation; 257 folder.Type = (short)AssetType.Animation;
258 folder.version = 1; 258 folder.Version = 1;
259 Folders.Add(folder.folderID, folder); 259 Folders.Add(folder.ID, folder);
260 260
261 folder = new InventoryFolderBase(); 261 folder = new InventoryFolderBase();
262 folder.parentID = rootFolder; 262 folder.ParentID = rootFolder;
263 folder.agentID = user; 263 folder.AgentID = user;
264 folder.folderID = LLUUID.Random(); 264 folder.ID = LLUUID.Random();
265 folder.name = "Body Parts"; 265 folder.Name = "Body Parts";
266 folder.type = (short)AssetType.Bodypart; 266 folder.Type = (short)AssetType.Bodypart;
267 folder.version = 1; 267 folder.Version = 1;
268 Folders.Add(folder.folderID, folder); 268 Folders.Add(folder.ID, folder);
269 269
270 folder = new InventoryFolderBase(); 270 folder = new InventoryFolderBase();
271 folder.parentID = rootFolder; 271 folder.ParentID = rootFolder;
272 folder.agentID = user; 272 folder.AgentID = user;
273 folder.folderID = LLUUID.Random(); 273 folder.ID = LLUUID.Random();
274 folder.name = "Calling Cards"; 274 folder.Name = "Calling Cards";
275 folder.type = (short)AssetType.CallingCard; 275 folder.Type = (short)AssetType.CallingCard;
276 folder.version = 1; 276 folder.Version = 1;
277 Folders.Add(folder.folderID, folder); 277 Folders.Add(folder.ID, folder);
278 278
279 folder = new InventoryFolderBase(); 279 folder = new InventoryFolderBase();
280 folder.parentID = rootFolder; 280 folder.ParentID = rootFolder;
281 folder.agentID = user; 281 folder.AgentID = user;
282 folder.folderID = LLUUID.Random(); 282 folder.ID = LLUUID.Random();
283 folder.name = "Clothing"; 283 folder.Name = "Clothing";
284 folder.type = (short)AssetType.Clothing; 284 folder.Type = (short)AssetType.Clothing;
285 folder.version = 1; 285 folder.Version = 1;
286 Folders.Add(folder.folderID, folder); 286 Folders.Add(folder.ID, folder);
287 287
288 folder = new InventoryFolderBase(); 288 folder = new InventoryFolderBase();
289 folder.parentID = rootFolder; 289 folder.ParentID = rootFolder;
290 folder.agentID = user; 290 folder.AgentID = user;
291 folder.folderID = LLUUID.Random(); 291 folder.ID = LLUUID.Random();
292 folder.name = "Gestures"; 292 folder.Name = "Gestures";
293 folder.type = (short)AssetType.Gesture; 293 folder.Type = (short)AssetType.Gesture;
294 folder.version = 1; 294 folder.Version = 1;
295 Folders.Add(folder.folderID, folder); 295 Folders.Add(folder.ID, folder);
296 296
297 folder = new InventoryFolderBase(); 297 folder = new InventoryFolderBase();
298 folder.parentID = rootFolder; 298 folder.ParentID = rootFolder;
299 folder.agentID = user; 299 folder.AgentID = user;
300 folder.folderID = LLUUID.Random(); 300 folder.ID = LLUUID.Random();
301 folder.name = "Landmarks"; 301 folder.Name = "Landmarks";
302 folder.type = (short)AssetType.Landmark; 302 folder.Type = (short)AssetType.Landmark;
303 folder.version = 1; 303 folder.Version = 1;
304 Folders.Add(folder.folderID, folder); 304 Folders.Add(folder.ID, folder);
305 305
306 folder = new InventoryFolderBase(); 306 folder = new InventoryFolderBase();
307 folder.parentID = rootFolder; 307 folder.ParentID = rootFolder;
308 folder.agentID = user; 308 folder.AgentID = user;
309 folder.folderID = LLUUID.Random(); 309 folder.ID = LLUUID.Random();
310 folder.name = "Lost And Found"; 310 folder.Name = "Lost And Found";
311 folder.type = (short)AssetType.LostAndFoundFolder; 311 folder.Type = (short)AssetType.LostAndFoundFolder;
312 folder.version = 1; 312 folder.Version = 1;
313 Folders.Add(folder.folderID, folder); 313 Folders.Add(folder.ID, folder);
314 314
315 folder = new InventoryFolderBase(); 315 folder = new InventoryFolderBase();
316 folder.parentID = rootFolder; 316 folder.ParentID = rootFolder;
317 folder.agentID = user; 317 folder.AgentID = user;
318 folder.folderID = LLUUID.Random(); 318 folder.ID = LLUUID.Random();
319 folder.name = "Notecards"; 319 folder.Name = "Notecards";
320 folder.type = (short)AssetType.Notecard; 320 folder.Type = (short)AssetType.Notecard;
321 folder.version = 1; 321 folder.Version = 1;
322 Folders.Add(folder.folderID, folder); 322 Folders.Add(folder.ID, folder);
323 323
324 folder = new InventoryFolderBase(); 324 folder = new InventoryFolderBase();
325 folder.parentID = rootFolder; 325 folder.ParentID = rootFolder;
326 folder.agentID = user; 326 folder.AgentID = user;
327 folder.folderID = LLUUID.Random(); 327 folder.ID = LLUUID.Random();
328 folder.name = "Objects"; 328 folder.Name = "Objects";
329 folder.type = (short)AssetType.Primitive; 329 folder.Type = (short)AssetType.Primitive;
330 folder.version = 1; 330 folder.Version = 1;
331 Folders.Add(folder.folderID, folder); 331 Folders.Add(folder.ID, folder);
332 332
333 folder = new InventoryFolderBase(); 333 folder = new InventoryFolderBase();
334 folder.parentID = rootFolder; 334 folder.ParentID = rootFolder;
335 folder.agentID = user; 335 folder.AgentID = user;
336 folder.folderID = LLUUID.Random(); 336 folder.ID = LLUUID.Random();
337 folder.name = "Photo Album"; 337 folder.Name = "Photo Album";
338 folder.type = (short)AssetType.SnapshotFolder; 338 folder.Type = (short)AssetType.SnapshotFolder;
339 folder.version = 1; 339 folder.Version = 1;
340 Folders.Add(folder.folderID, folder); 340 Folders.Add(folder.ID, folder);
341 341
342 folder = new InventoryFolderBase(); 342 folder = new InventoryFolderBase();
343 folder.parentID = rootFolder; 343 folder.ParentID = rootFolder;
344 folder.agentID = user; 344 folder.AgentID = user;
345 folder.folderID = LLUUID.Random(); 345 folder.ID = LLUUID.Random();
346 folder.name = "Scripts"; 346 folder.Name = "Scripts";
347 folder.type = (short)AssetType.LSLText; 347 folder.Type = (short)AssetType.LSLText;
348 folder.version = 1; 348 folder.Version = 1;
349 Folders.Add(folder.folderID, folder); 349 Folders.Add(folder.ID, folder);
350 350
351 folder = new InventoryFolderBase(); 351 folder = new InventoryFolderBase();
352 folder.parentID = rootFolder; 352 folder.ParentID = rootFolder;
353 folder.agentID = user; 353 folder.AgentID = user;
354 folder.folderID = LLUUID.Random(); 354 folder.ID = LLUUID.Random();
355 folder.name = "Sounds"; 355 folder.Name = "Sounds";
356 folder.type = (short)AssetType.Sound; 356 folder.Type = (short)AssetType.Sound;
357 folder.version = 1; 357 folder.Version = 1;
358 Folders.Add(folder.folderID, folder); 358 Folders.Add(folder.ID, folder);
359 359
360 folder = new InventoryFolderBase(); 360 folder = new InventoryFolderBase();
361 folder.parentID = rootFolder; 361 folder.ParentID = rootFolder;
362 folder.agentID = user; 362 folder.AgentID = user;
363 folder.folderID = LLUUID.Random(); 363 folder.ID = LLUUID.Random();
364 folder.name = "Textures"; 364 folder.Name = "Textures";
365 folder.type = (short)AssetType.Texture; 365 folder.Type = (short)AssetType.Texture;
366 folder.version = 1; 366 folder.Version = 1;
367 Folders.Add(folder.folderID, folder); 367 Folders.Add(folder.ID, folder);
368 368
369 folder = new InventoryFolderBase(); 369 folder = new InventoryFolderBase();
370 folder.parentID = rootFolder; 370 folder.ParentID = rootFolder;
371 folder.agentID = user; 371 folder.AgentID = user;
372 folder.folderID = LLUUID.Random(); 372 folder.ID = LLUUID.Random();
373 folder.name = "Trash"; 373 folder.Name = "Trash";
374 folder.type = (short)AssetType.TrashFolder; 374 folder.Type = (short)AssetType.TrashFolder;
375 folder.version = 1; 375 folder.Version = 1;
376 Folders.Add(folder.folderID, folder); 376 Folders.Add(folder.ID, folder);
377 } 377 }
378 } 378 }
379 } 379 }