aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorSean Dague2008-04-08 23:26:31 +0000
committerSean Dague2008-04-08 23:26:31 +0000
commita6d27e09295cd0160d3439fbfa6598f08c431608 (patch)
treefc416f3da7af6fd14a06d24a1a43e924c458853e /OpenSim/Grid
parentadded migration script for SqliteAssets (diff)
downloadopensim-SC_OLD-a6d27e09295cd0160d3439fbfa6598f08c431608.zip
opensim-SC_OLD-a6d27e09295cd0160d3439fbfa6598f08c431608.tar.gz
opensim-SC_OLD-a6d27e09295cd0160d3439fbfa6598f08c431608.tar.bz2
opensim-SC_OLD-a6d27e09295cd0160d3439fbfa6598f08c431608.tar.xz
further refactor and rename of InventoryFolderBase properties
to reflect what they really are.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs2
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 46fbd3d..f08c1e5 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Grid.InventoryServer
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.Owner, folder);
173 return true; 173 return true;
174 } 174 }
175 175
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index aad02c3..ed154a8 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -111,12 +111,12 @@ namespace OpenSim.Grid.InventoryServer
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.Owner == LLUUID.Zero)
115 { 115 {
116 if (parent != null) 116 if (parent != null)
117 f.AgentID = parent.AgentID; 117 f.Owner = parent.Owner;
118 else 118 else
119 f.AgentID = f.ID; 119 f.Owner = f.ID;
120 modified = true; 120 modified = true;
121 } 121 }
122 122