From 5ee75998ce4d941efd937848d28f3a4dac6ba6cc Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 7 Apr 2008 23:27:05 +0000
Subject: more refactoring, this time on InventoryFolderBase  * wrap attributes
 in properties  * clean up names a little bit  * clean up name styles

---
 .../Region/Communications/Local/LocalInventoryService.cs   |  6 +++---
 OpenSim/Region/Communications/Local/LocalLoginService.cs   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Communications/Local')

diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index df735a9..bb3db9d 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
             //need to make sure we send root folder first
             foreach (InventoryFolderBase folder in folders)
             {
-                if (folder.parentID == LLUUID.Zero)
+                if (folder.ParentID == LLUUID.Zero)
                 {
                     rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
                 }
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Communications.Local
             {
                 foreach (InventoryFolderBase folder in folders)
                 {
-                    if (folder.folderID != rootFolder.folderID)
+                    if (folder.ID != rootFolder.ID)
                     {
                         RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
                     }
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.Local
             InventoryFolderImpl newFolder = new InventoryFolderImpl(folder);
             folderCallBack(userID, newFolder);
 
-            List<InventoryItemBase> items = RequestFolderItems(newFolder.folderID);
+            List<InventoryItemBase> items = RequestFolderItems(newFolder.ID);
             foreach (InventoryItemBase item in items)
             {
                 itemCallBack(userID, item);
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 8583e61..4632716 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -229,16 +229,16 @@ namespace OpenSim.Region.Communications.Local
             Hashtable TempHash;
             foreach (InventoryFolderBase InvFolder in folders)
             {
-                if (InvFolder.parentID == LLUUID.Zero)
+                if (InvFolder.ParentID == LLUUID.Zero)
                 {
-                    rootID = InvFolder.folderID;
+                    rootID = InvFolder.ID;
                 }
                 TempHash = new Hashtable();
-                TempHash["name"] = InvFolder.name;
-                TempHash["parent_id"] = InvFolder.parentID.ToString();
-                TempHash["version"] = (Int32) InvFolder.version;
-                TempHash["type_default"] = (Int32) InvFolder.type;
-                TempHash["folder_id"] = InvFolder.folderID.ToString();
+                TempHash["name"] = InvFolder.Name;
+                TempHash["parent_id"] = InvFolder.ParentID.ToString();
+                TempHash["version"] = (Int32) InvFolder.Version;
+                TempHash["type_default"] = (Int32) InvFolder.Type;
+                TempHash["folder_id"] = InvFolder.ID.ToString();
                 AgentInventoryArray.Add(TempHash);
             }
             
-- 
cgit v1.1