aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-04-08 23:26:31 +0000
committerSean Dague2008-04-08 23:26:31 +0000
commita6d27e09295cd0160d3439fbfa6598f08c431608 (patch)
treefc416f3da7af6fd14a06d24a1a43e924c458853e
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.
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs4
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs8
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs12
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs30
-rw-r--r--OpenSim/Framework/InventoryFolderBase.cs8
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs2
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs6
12 files changed, 45 insertions, 45 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index f53d9f9..09d4710 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -370,7 +370,7 @@ namespace OpenSim.Data.MSSQL
370 try 370 try
371 { 371 {
372 InventoryFolderBase folder = new InventoryFolderBase(); 372 InventoryFolderBase folder = new InventoryFolderBase();
373 folder.AgentID = new LLUUID((string) reader["agentID"]); 373 folder.Owner = new LLUUID((string) reader["agentID"]);
374 folder.ParentID = new LLUUID((string) reader["parentFolderID"]); 374 folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
375 folder.ID = new LLUUID((string) reader["folderID"]); 375 folder.ID = new LLUUID((string) reader["folderID"]);
376 folder.Name = (string) reader["folderName"]; 376 folder.Name = (string) reader["folderName"];
@@ -558,7 +558,7 @@ namespace OpenSim.Data.MSSQL
558 558
559 Dictionary<string, string> param = new Dictionary<string, string>(); 559 Dictionary<string, string> param = new Dictionary<string, string>();
560 param["folderID"] = folder.ID.ToString(); 560 param["folderID"] = folder.ID.ToString();
561 param["agentID"] = folder.AgentID.ToString(); 561 param["agentID"] = folder.Owner.ToString();
562 param["parentFolderID"] = folder.ParentID.ToString(); 562 param["parentFolderID"] = folder.ParentID.ToString();
563 param["folderName"] = folder.Name; 563 param["folderName"] = folder.Name;
564 param["type"] = Convert.ToString(folder.Type); 564 param["type"] = Convert.ToString(folder.Type);
@@ -590,7 +590,7 @@ namespace OpenSim.Data.MSSQL
590 "version = @version where " + 590 "version = @version where " +
591 "folderID = @keyFolderID;", database.getConnection()); 591 "folderID = @keyFolderID;", database.getConnection());
592 SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString()); 592 SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString());
593 SqlParameter param2 = new SqlParameter("@agentID", folder.AgentID.ToString()); 593 SqlParameter param2 = new SqlParameter("@agentID", folder.Owner.ToString());
594 SqlParameter param3 = new SqlParameter("@parentFolderID", folder.ParentID.ToString()); 594 SqlParameter param3 = new SqlParameter("@parentFolderID", folder.ParentID.ToString());
595 SqlParameter param4 = new SqlParameter("@folderName", folder.Name); 595 SqlParameter param4 = new SqlParameter("@folderName", folder.Name);
596 SqlParameter param5 = new SqlParameter("@type", folder.Type); 596 SqlParameter param5 = new SqlParameter("@type", folder.Type);
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 6cc8998..ce9829a 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -381,7 +381,7 @@ namespace OpenSim.Data.MySQL
381 try 381 try
382 { 382 {
383 InventoryFolderBase folder = new InventoryFolderBase(); 383 InventoryFolderBase folder = new InventoryFolderBase();
384 folder.AgentID = new LLUUID((string) reader["agentID"]); 384 folder.Owner = new LLUUID((string) reader["agentID"]);
385 folder.ParentID = new LLUUID((string) reader["parentFolderID"]); 385 folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
386 folder.ID = new LLUUID((string) reader["folderID"]); 386 folder.ID = new LLUUID((string) reader["folderID"]);
387 folder.Name = (string) reader["folderName"]; 387 folder.Name = (string) reader["folderName"];
@@ -508,7 +508,7 @@ namespace OpenSim.Data.MySQL
508 508
509 MySqlCommand cmd = new MySqlCommand(sql, database.Connection); 509 MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
510 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString()); 510 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
511 cmd.Parameters.AddWithValue("?agentID", folder.AgentID.ToString()); 511 cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
512 cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString()); 512 cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
513 cmd.Parameters.AddWithValue("?folderName", folder.Name); 513 cmd.Parameters.AddWithValue("?folderName", folder.Name);
514 cmd.Parameters.AddWithValue("?type", (short) folder.Type); 514 cmd.Parameters.AddWithValue("?type", (short) folder.Type);
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 6bc2e62..9e35b76 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -73,11 +73,11 @@ namespace OpenSim.Data.NHibernate
73 cfg.AddAssembly("OpenSim.Data.NHibernate"); 73 cfg.AddAssembly("OpenSim.Data.NHibernate");
74 74
75 HbmSerializer.Default.Validate = true; 75 HbmSerializer.Default.Validate = true;
76 // using ( System.IO.MemoryStream stream = 76 using ( System.IO.MemoryStream stream =
77 // HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 77 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
78 // cfg.AddInputStream(stream); 78 cfg.AddInputStream(stream);
79 79
80 // new SchemaExport(cfg).Create(true, true); 80 new SchemaExport(cfg).Create(true, true);
81 81
82 factory = cfg.BuildSessionFactory(); 82 factory = cfg.BuildSessionFactory();
83 } 83 }
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index e8663b4..4ccea59 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -592,7 +592,7 @@ namespace OpenSim.Data.SQLite
592 InventoryFolderBase folder = new InventoryFolderBase(); 592 InventoryFolderBase folder = new InventoryFolderBase();
593 folder.ID = new LLUUID((string) row["UUID"]); 593 folder.ID = new LLUUID((string) row["UUID"]);
594 folder.Name = (string) row["name"]; 594 folder.Name = (string) row["name"];
595 folder.AgentID = new LLUUID((string) row["agentID"]); 595 folder.Owner = new LLUUID((string) row["agentID"]);
596 folder.ParentID = new LLUUID((string) row["parentID"]); 596 folder.ParentID = new LLUUID((string) row["parentID"]);
597 folder.Type = Convert.ToInt16(row["type"]); 597 folder.Type = Convert.ToInt16(row["type"]);
598 folder.Version = Convert.ToUInt16(row["version"]); 598 folder.Version = Convert.ToUInt16(row["version"]);
@@ -603,7 +603,7 @@ namespace OpenSim.Data.SQLite
603 { 603 {
604 row["UUID"] = Util.ToRawUuidString(folder.ID); 604 row["UUID"] = Util.ToRawUuidString(folder.ID);
605 row["name"] = folder.Name; 605 row["name"] = folder.Name;
606 row["agentID"] = Util.ToRawUuidString(folder.AgentID); 606 row["agentID"] = Util.ToRawUuidString(folder.Owner);
607 row["parentID"] = Util.ToRawUuidString(folder.ParentID); 607 row["parentID"] = Util.ToRawUuidString(folder.ParentID);
608 row["type"] = folder.Type; 608 row["type"] = folder.Type;
609 row["version"] = folder.Version; 609 row["version"] = folder.Version;
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 37907a0..091a6a3 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications.Cache
45 // Constructors 45 // Constructors
46 public InventoryFolderImpl(InventoryFolderBase folderbase) 46 public InventoryFolderImpl(InventoryFolderBase folderbase)
47 { 47 {
48 AgentID = folderbase.AgentID; 48 Owner = folderbase.Owner;
49 ID = folderbase.ID; 49 ID = folderbase.ID;
50 Name = folderbase.Name; 50 Name = folderbase.Name;
51 ParentID = folderbase.ParentID; 51 ParentID = folderbase.ParentID;
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Communications.Cache
67 subFold.ID = folderID; 67 subFold.ID = folderID;
68 subFold.Type = (short) type; 68 subFold.Type = (short) type;
69 subFold.ParentID = this.ID; 69 subFold.ParentID = this.ID;
70 subFold.AgentID = AgentID; 70 subFold.Owner = Owner;
71 SubFolders.Add(subFold.ID, subFold); 71 SubFolders.Add(subFold.ID, subFold);
72 return subFold; 72 return subFold;
73 } 73 }
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index cb82850..03036d0 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Communications.Cache
56 { 56 {
57 m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); 57 m_log.Info("[LIBRARY INVENTORY]: Loading library inventory");
58 58
59 AgentID = libOwner; 59 Owner = libOwner;
60 ID = new LLUUID("00000112-000f-0000-0000-000100bba000"); 60 ID = new LLUUID("00000112-000f-0000-0000-000100bba000");
61 Name = "OpenSim Library"; 61 Name = "OpenSim Library";
62 ParentID = LLUUID.Zero; 62 ParentID = LLUUID.Zero;
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Communications.Cache
177 folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString())); 177 folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString()));
178 folderInfo.Type = (short)config.GetInt("type", 8); 178 folderInfo.Type = (short)config.GetInt("type", 8);
179 179
180 folderInfo.AgentID = libOwner; 180 folderInfo.Owner = libOwner;
181 folderInfo.Version = 1; 181 folderInfo.Version = 1;
182 182
183 if (libraryFolders.ContainsKey(folderInfo.ParentID)) 183 if (libraryFolders.ContainsKey(folderInfo.ParentID))
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index b22c0af..2dc2374 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Communications.Cache
113 if (createdFolder != null) 113 if (createdFolder != null)
114 { 114 {
115 InventoryFolderBase createdBaseFolder = new InventoryFolderBase(); 115 InventoryFolderBase createdBaseFolder = new InventoryFolderBase();
116 createdBaseFolder.AgentID = createdFolder.AgentID; 116 createdBaseFolder.Owner = createdFolder.Owner;
117 createdBaseFolder.ID = createdFolder.ID; 117 createdBaseFolder.ID = createdFolder.ID;
118 createdBaseFolder.Name = createdFolder.Name; 118 createdBaseFolder.Name = createdFolder.Name;
119 createdBaseFolder.ParentID = createdFolder.ParentID; 119 createdBaseFolder.ParentID = createdFolder.ParentID;
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Communications.Cache
156 if (userProfile.RootFolder != null) 156 if (userProfile.RootFolder != null)
157 { 157 {
158 InventoryFolderBase baseFolder = new InventoryFolderBase(); 158 InventoryFolderBase baseFolder = new InventoryFolderBase();
159 baseFolder.AgentID = remoteClient.AgentId; 159 baseFolder.Owner = remoteClient.AgentId;
160 baseFolder.ID = folderID; 160 baseFolder.ID = folderID;
161 baseFolder.Name = name; 161 baseFolder.Name = name;
162 baseFolder.ParentID = parentID; 162 baseFolder.ParentID = parentID;
@@ -176,7 +176,7 @@ namespace OpenSim.Framework.Communications.Cache
176 if (userProfile.RootFolder != null) 176 if (userProfile.RootFolder != null)
177 { 177 {
178 InventoryFolderBase baseFolder = new InventoryFolderBase(); 178 InventoryFolderBase baseFolder = new InventoryFolderBase();
179 baseFolder.AgentID = remoteClient.AgentId; 179 baseFolder.Owner = remoteClient.AgentId;
180 baseFolder.ID = folderID; 180 baseFolder.ID = folderID;
181 baseFolder.ParentID = parentID; 181 baseFolder.ParentID = parentID;
182 m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder); 182 m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder);
@@ -202,7 +202,7 @@ namespace OpenSim.Framework.Communications.Cache
202 if (folderID == libraryRoot.ID) 202 if (folderID == libraryRoot.ID)
203 { 203 {
204 remoteClient.SendInventoryFolderDetails( 204 remoteClient.SendInventoryFolderDetails(
205 libraryRoot.AgentID, libraryRoot.ID, libraryRoot.RequestListOfItems(), 205 libraryRoot.Owner, libraryRoot.ID, libraryRoot.RequestListOfItems(),
206 libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems); 206 libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems);
207 207
208 return; 208 return;
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Communications.Cache
211 if ((fold = libraryRoot.HasSubFolder(folderID)) != null) 211 if ((fold = libraryRoot.HasSubFolder(folderID)) != null)
212 { 212 {
213 remoteClient.SendInventoryFolderDetails( 213 remoteClient.SendInventoryFolderDetails(
214 libraryRoot.AgentID, folderID, fold.RequestListOfItems(), 214 libraryRoot.Owner, folderID, fold.RequestListOfItems(),
215 fold.RequestListOfFolders(), fetchFolders, fetchItems); 215 fold.RequestListOfFolders(), fetchFolders, fetchItems);
216 216
217 return; 217 return;
@@ -379,7 +379,7 @@ namespace OpenSim.Framework.Communications.Cache
379 379
380 public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) 380 public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID)
381 { 381 {
382 if (ownerID == libraryRoot.AgentID) 382 if (ownerID == libraryRoot.Owner)
383 { 383 {
384 //Console.WriteLine("request info for library item"); 384 //Console.WriteLine("request info for library item");
385 385
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 6b5ef1b..95a0e05 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications
240 240
241 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) 241 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
242 { 242 {
243 if (uuid == m_userProfileCacheService.libraryRoot.AgentID) 243 if (uuid == m_userProfileCacheService.libraryRoot.Owner)
244 { 244 {
245 remote_client.SendNameReply(uuid, "Mr", "OpenSim"); 245 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
246 } 246 }
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 1250f53..97d963d 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications
240 InventoryFolderBase folder = new InventoryFolderBase(); 240 InventoryFolderBase folder = new InventoryFolderBase();
241 241
242 folder.ParentID = LLUUID.Zero; 242 folder.ParentID = LLUUID.Zero;
243 folder.AgentID = user; 243 folder.Owner = user;
244 folder.ID = LLUUID.Random(); 244 folder.ID = LLUUID.Random();
245 folder.Name = "My Inventory"; 245 folder.Name = "My Inventory";
246 folder.Type = (short)AssetType.Folder; 246 folder.Type = (short)AssetType.Folder;
@@ -251,7 +251,7 @@ namespace OpenSim.Framework.Communications
251 251
252 folder = new InventoryFolderBase(); 252 folder = new InventoryFolderBase();
253 folder.ParentID = rootFolder; 253 folder.ParentID = rootFolder;
254 folder.AgentID = user; 254 folder.Owner = user;
255 folder.ID = LLUUID.Random(); 255 folder.ID = LLUUID.Random();
256 folder.Name = "Animations"; 256 folder.Name = "Animations";
257 folder.Type = (short)AssetType.Animation; 257 folder.Type = (short)AssetType.Animation;
@@ -260,7 +260,7 @@ namespace OpenSim.Framework.Communications
260 260
261 folder = new InventoryFolderBase(); 261 folder = new InventoryFolderBase();
262 folder.ParentID = rootFolder; 262 folder.ParentID = rootFolder;
263 folder.AgentID = user; 263 folder.Owner = user;
264 folder.ID = LLUUID.Random(); 264 folder.ID = LLUUID.Random();
265 folder.Name = "Body Parts"; 265 folder.Name = "Body Parts";
266 folder.Type = (short)AssetType.Bodypart; 266 folder.Type = (short)AssetType.Bodypart;
@@ -269,7 +269,7 @@ namespace OpenSim.Framework.Communications
269 269
270 folder = new InventoryFolderBase(); 270 folder = new InventoryFolderBase();
271 folder.ParentID = rootFolder; 271 folder.ParentID = rootFolder;
272 folder.AgentID = user; 272 folder.Owner = user;
273 folder.ID = LLUUID.Random(); 273 folder.ID = LLUUID.Random();
274 folder.Name = "Calling Cards"; 274 folder.Name = "Calling Cards";
275 folder.Type = (short)AssetType.CallingCard; 275 folder.Type = (short)AssetType.CallingCard;
@@ -278,7 +278,7 @@ namespace OpenSim.Framework.Communications
278 278
279 folder = new InventoryFolderBase(); 279 folder = new InventoryFolderBase();
280 folder.ParentID = rootFolder; 280 folder.ParentID = rootFolder;
281 folder.AgentID = user; 281 folder.Owner = user;
282 folder.ID = LLUUID.Random(); 282 folder.ID = LLUUID.Random();
283 folder.Name = "Clothing"; 283 folder.Name = "Clothing";
284 folder.Type = (short)AssetType.Clothing; 284 folder.Type = (short)AssetType.Clothing;
@@ -287,7 +287,7 @@ namespace OpenSim.Framework.Communications
287 287
288 folder = new InventoryFolderBase(); 288 folder = new InventoryFolderBase();
289 folder.ParentID = rootFolder; 289 folder.ParentID = rootFolder;
290 folder.AgentID = user; 290 folder.Owner = user;
291 folder.ID = LLUUID.Random(); 291 folder.ID = LLUUID.Random();
292 folder.Name = "Gestures"; 292 folder.Name = "Gestures";
293 folder.Type = (short)AssetType.Gesture; 293 folder.Type = (short)AssetType.Gesture;
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications
296 296
297 folder = new InventoryFolderBase(); 297 folder = new InventoryFolderBase();
298 folder.ParentID = rootFolder; 298 folder.ParentID = rootFolder;
299 folder.AgentID = user; 299 folder.Owner = user;
300 folder.ID = LLUUID.Random(); 300 folder.ID = LLUUID.Random();
301 folder.Name = "Landmarks"; 301 folder.Name = "Landmarks";
302 folder.Type = (short)AssetType.Landmark; 302 folder.Type = (short)AssetType.Landmark;
@@ -305,7 +305,7 @@ namespace OpenSim.Framework.Communications
305 305
306 folder = new InventoryFolderBase(); 306 folder = new InventoryFolderBase();
307 folder.ParentID = rootFolder; 307 folder.ParentID = rootFolder;
308 folder.AgentID = user; 308 folder.Owner = user;
309 folder.ID = LLUUID.Random(); 309 folder.ID = LLUUID.Random();
310 folder.Name = "Lost And Found"; 310 folder.Name = "Lost And Found";
311 folder.Type = (short)AssetType.LostAndFoundFolder; 311 folder.Type = (short)AssetType.LostAndFoundFolder;
@@ -314,7 +314,7 @@ namespace OpenSim.Framework.Communications
314 314
315 folder = new InventoryFolderBase(); 315 folder = new InventoryFolderBase();
316 folder.ParentID = rootFolder; 316 folder.ParentID = rootFolder;
317 folder.AgentID = user; 317 folder.Owner = user;
318 folder.ID = LLUUID.Random(); 318 folder.ID = LLUUID.Random();
319 folder.Name = "Notecards"; 319 folder.Name = "Notecards";
320 folder.Type = (short)AssetType.Notecard; 320 folder.Type = (short)AssetType.Notecard;
@@ -323,7 +323,7 @@ namespace OpenSim.Framework.Communications
323 323
324 folder = new InventoryFolderBase(); 324 folder = new InventoryFolderBase();
325 folder.ParentID = rootFolder; 325 folder.ParentID = rootFolder;
326 folder.AgentID = user; 326 folder.Owner = user;
327 folder.ID = LLUUID.Random(); 327 folder.ID = LLUUID.Random();
328 folder.Name = "Objects"; 328 folder.Name = "Objects";
329 folder.Type = (short)AssetType.Object; 329 folder.Type = (short)AssetType.Object;
@@ -332,7 +332,7 @@ namespace OpenSim.Framework.Communications
332 332
333 folder = new InventoryFolderBase(); 333 folder = new InventoryFolderBase();
334 folder.ParentID = rootFolder; 334 folder.ParentID = rootFolder;
335 folder.AgentID = user; 335 folder.Owner = user;
336 folder.ID = LLUUID.Random(); 336 folder.ID = LLUUID.Random();
337 folder.Name = "Photo Album"; 337 folder.Name = "Photo Album";
338 folder.Type = (short)AssetType.SnapshotFolder; 338 folder.Type = (short)AssetType.SnapshotFolder;
@@ -341,7 +341,7 @@ namespace OpenSim.Framework.Communications
341 341
342 folder = new InventoryFolderBase(); 342 folder = new InventoryFolderBase();
343 folder.ParentID = rootFolder; 343 folder.ParentID = rootFolder;
344 folder.AgentID = user; 344 folder.Owner = user;
345 folder.ID = LLUUID.Random(); 345 folder.ID = LLUUID.Random();
346 folder.Name = "Scripts"; 346 folder.Name = "Scripts";
347 folder.Type = (short)AssetType.LSLText; 347 folder.Type = (short)AssetType.LSLText;
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
350 350
351 folder = new InventoryFolderBase(); 351 folder = new InventoryFolderBase();
352 folder.ParentID = rootFolder; 352 folder.ParentID = rootFolder;
353 folder.AgentID = user; 353 folder.Owner = user;
354 folder.ID = LLUUID.Random(); 354 folder.ID = LLUUID.Random();
355 folder.Name = "Sounds"; 355 folder.Name = "Sounds";
356 folder.Type = (short)AssetType.Sound; 356 folder.Type = (short)AssetType.Sound;
@@ -359,7 +359,7 @@ namespace OpenSim.Framework.Communications
359 359
360 folder = new InventoryFolderBase(); 360 folder = new InventoryFolderBase();
361 folder.ParentID = rootFolder; 361 folder.ParentID = rootFolder;
362 folder.AgentID = user; 362 folder.Owner = user;
363 folder.ID = LLUUID.Random(); 363 folder.ID = LLUUID.Random();
364 folder.Name = "Textures"; 364 folder.Name = "Textures";
365 folder.Type = (short)AssetType.Texture; 365 folder.Type = (short)AssetType.Texture;
@@ -368,7 +368,7 @@ namespace OpenSim.Framework.Communications
368 368
369 folder = new InventoryFolderBase(); 369 folder = new InventoryFolderBase();
370 folder.ParentID = rootFolder; 370 folder.ParentID = rootFolder;
371 folder.AgentID = user; 371 folder.Owner = user;
372 folder.ID = LLUUID.Random(); 372 folder.ID = LLUUID.Random();
373 folder.Name = "Trash"; 373 folder.Name = "Trash";
374 folder.Type = (short)AssetType.TrashFolder; 374 folder.Type = (short)AssetType.TrashFolder;
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index 19d3d40..3284c59 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework
45 /// <summary> 45 /// <summary>
46 /// The agent who's inventory this is contained by 46 /// The agent who's inventory this is contained by
47 /// </summary> 47 /// </summary>
48 private LLUUID _agentID; 48 private LLUUID _owner;
49 49
50 /// <summary> 50 /// <summary>
51 /// The folder this folder is contained in 51 /// The folder this folder is contained in
@@ -76,12 +76,12 @@ namespace OpenSim.Framework
76 } 76 }
77 } 77 }
78 78
79 public LLUUID AgentID { 79 public LLUUID Owner {
80 get { 80 get {
81 return _agentID; 81 return _owner;
82 } 82 }
83 set { 83 set {
84 _agentID = value; 84 _owner = value;
85 } 85 }
86 } 86 }
87 87
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