aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/InventoryServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/InventoryServer')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs14
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs14
2 files changed, 14 insertions, 14 deletions
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
51 51
52 foreach (InventoryFolderBase folder in allFolders) 52 foreach (InventoryFolderBase folder in allFolders)
53 { 53 {
54 List<InventoryItemBase> items = RequestFolderItems(folder.folderID); 54 List<InventoryItemBase> items = RequestFolderItems(folder.ID);
55 if (items != null) 55 if (items != null)
56 { 56 {
57 allItems.InsertRange(0, items); 57 allItems.InsertRange(0, items);
@@ -79,7 +79,7 @@ namespace OpenSim.Grid.InventoryServer
79 allFolders.InsertRange(0, folders); 79 allFolders.InsertRange(0, folders);
80 foreach (InventoryFolderBase subfolder in folders) 80 foreach (InventoryFolderBase subfolder in folders)
81 { 81 {
82 List<InventoryFolderBase> subFolders = GetAllFolders(subfolder.folderID); 82 List<InventoryFolderBase> subFolders = GetAllFolders(subfolder.ID);
83 if (subFolders != null) 83 if (subFolders != null)
84 { 84 {
85 allFolders.InsertRange(0, subFolders); 85 allFolders.InsertRange(0, subFolders);
@@ -166,10 +166,10 @@ namespace OpenSim.Grid.InventoryServer
166 // Right now, this actions act more like an update/insert combination than a simple create. 166 // Right now, this actions act more like an update/insert combination than a simple create.
167 m_log.Info( 167 m_log.Info(
168 "[AGENT INVENTORY]: " + 168 "[AGENT INVENTORY]: " +
169 "Updating in " + folder.parentID.ToString() 169 "Updating in " + folder.ParentID.ToString()
170 + ", folder " + folder.name); 170 + ", folder " + folder.Name);
171 171
172 AddNewInventoryFolder(folder.agentID, folder); 172 AddNewInventoryFolder(folder.AgentID, folder);
173 return true; 173 return true;
174 } 174 }
175 175
@@ -177,8 +177,8 @@ namespace OpenSim.Grid.InventoryServer
177 { 177 {
178 m_log.Info( 178 m_log.Info(
179 "[AGENT INVENTORY]: " + 179 "[AGENT INVENTORY]: " +
180 "Moving folder " + folder.folderID 180 "Moving folder " + folder.ID
181 + " to " + folder.parentID.ToString()); 181 + " to " + folder.ParentID.ToString());
182 182
183 MoveExistingInventoryFolder(folder); 183 MoveExistingInventoryFolder(folder);
184 return true; 184 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
104 bool modified = false; 104 bool modified = false;
105 105
106 // ensure we have a valid folder id 106 // ensure we have a valid folder id
107 if (f.folderID == LLUUID.Zero) 107 if (f.ID == LLUUID.Zero)
108 { 108 {
109 f.folderID = LLUUID.Random(); 109 f.ID = LLUUID.Random();
110 modified = true; 110 modified = true;
111 } 111 }
112 112
113 // ensure we have valid agent id 113 // ensure we have valid agent id
114 if (f.agentID == LLUUID.Zero) 114 if (f.AgentID == LLUUID.Zero)
115 { 115 {
116 if (parent != null) 116 if (parent != null)
117 f.agentID = parent.agentID; 117 f.AgentID = parent.AgentID;
118 else 118 else
119 f.agentID = f.folderID; 119 f.AgentID = f.ID;
120 modified = true; 120 modified = true;
121 } 121 }
122 122
123 if (f.parentID == LLUUID.Zero && parent != null) 123 if (f.ParentID == LLUUID.Zero && parent != null)
124 { 124 {
125 f.parentID = parent.folderID; 125 f.ParentID = parent.ID;
126 modified = true; 126 modified = true;
127 } 127 }
128 128