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

---
 OpenSim/Grid/InventoryServer/GridInventoryService.cs | 14 +++++++-------
 OpenSim/Grid/InventoryServer/InventoryManager.cs     | 14 +++++++-------
 OpenSim/Grid/UserServer/UserLoginService.cs          | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 92d82ab..46fbd3d 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Grid.InventoryServer
 
             foreach (InventoryFolderBase folder in allFolders)
             {
-                List<InventoryItemBase> items = RequestFolderItems(folder.folderID);
+                List<InventoryItemBase> items = RequestFolderItems(folder.ID);
                 if (items != null)
                 {
                     allItems.InsertRange(0, items);
@@ -79,7 +79,7 @@ namespace OpenSim.Grid.InventoryServer
                 allFolders.InsertRange(0, folders);
                 foreach (InventoryFolderBase subfolder in folders)
                 {
-                    List<InventoryFolderBase> subFolders = GetAllFolders(subfolder.folderID);
+                    List<InventoryFolderBase> subFolders = GetAllFolders(subfolder.ID);
                     if (subFolders != null)
                     {
                         allFolders.InsertRange(0, subFolders);
@@ -166,10 +166,10 @@ namespace OpenSim.Grid.InventoryServer
             // Right now, this actions act more like an update/insert combination than a simple create.
             m_log.Info(
                 "[AGENT INVENTORY]: " +
-                "Updating in   " + folder.parentID.ToString()
-                + ", folder " + folder.name);
+                "Updating in   " + folder.ParentID.ToString()
+                + ", folder " + folder.Name);
 
-            AddNewInventoryFolder(folder.agentID, folder);
+            AddNewInventoryFolder(folder.AgentID, folder);
             return true;
         }
 
@@ -177,8 +177,8 @@ namespace OpenSim.Grid.InventoryServer
         {
             m_log.Info(
                 "[AGENT INVENTORY]: " +
-                "Moving folder " + folder.folderID
-                + " to " + folder.parentID.ToString());
+                "Moving folder " + folder.ID
+                + " to " + folder.ParentID.ToString());
 
             MoveExistingInventoryFolder(folder);
             return true;
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index bbfaeed..aad02c3 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -104,25 +104,25 @@ namespace OpenSim.Grid.InventoryServer
             bool modified = false;
 
             // ensure we have a valid folder id
-            if (f.folderID == LLUUID.Zero)
+            if (f.ID == LLUUID.Zero)
             {
-                f.folderID = LLUUID.Random();
+                f.ID = LLUUID.Random();
                 modified = true;
             }
 
             // ensure we have  valid agent id 
-            if (f.agentID == LLUUID.Zero)
+            if (f.AgentID == LLUUID.Zero)
             {
                 if (parent != null)
-                    f.agentID = parent.agentID;
+                    f.AgentID = parent.AgentID;
                 else
-                    f.agentID = f.folderID;
+                    f.AgentID = f.ID;
                 modified = true;
             }
 
-            if (f.parentID == LLUUID.Zero && parent != null)
+            if (f.ParentID == LLUUID.Zero && parent != null)
             {
-                f.parentID = parent.folderID;
+                f.ParentID = parent.ID;
                 modified = true;
             }
 
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 5fad88a..f6bd974 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -325,16 +325,16 @@ namespace OpenSim.Grid.UserServer
                 {
 //                    m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
                     
-                    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);
                 }
                 return new InventoryData(AgentInventoryArray, rootID);
-- 
cgit v1.1