aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/InventoryServer/InventoryManager.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/Grid/InventoryServer/InventoryManager.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/Grid/InventoryServer/InventoryManager.cs')
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs14
1 files changed, 7 insertions, 7 deletions
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