aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-04-07 23:27:05 +0000
committerSean Dague2008-04-07 23:27:05 +0000
commit5ee75998ce4d941efd937848d28f3a4dac6ba6cc (patch)
treef29a100cb8ab3715c82f0aec4fee9f968f210405
parentRefactor InventoryItemBase to do the following: (diff)
downloadopensim-SC-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.zip
opensim-SC-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.gz
opensim-SC-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.bz2
opensim-SC-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.xz
more refactoring, this time on InventoryFolderBase
* wrap attributes in properties * clean up names a little bit * clean up name styles
Diffstat
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs50
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs34
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs10
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs42
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs26
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs24
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs40
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs46
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs216
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs10
-rw-r--r--OpenSim/Framework/InventoryFolderBase.cs66
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs14
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs14
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs14
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs8
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs14
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
20 files changed, 348 insertions, 294 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 15078aa..f53d9f9 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -370,12 +370,12 @@ 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.AgentID = new LLUUID((string) reader["agentID"]);
374 folder.parentID = new LLUUID((string) reader["parentFolderID"]); 374 folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
375 folder.folderID = 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"];
377 folder.type = (short) reader["type"]; 377 folder.Type = (short) reader["type"];
378 folder.version = (ushort) ((int) reader["version"]); 378 folder.Version = (ushort) ((int) reader["version"]);
379 return folder; 379 return folder;
380 } 380 }
381 catch (Exception e) 381 catch (Exception e)
@@ -557,12 +557,12 @@ namespace OpenSim.Data.MSSQL
557 557
558 558
559 Dictionary<string, string> param = new Dictionary<string, string>(); 559 Dictionary<string, string> param = new Dictionary<string, string>();
560 param["folderID"] = folder.folderID.ToString(); 560 param["folderID"] = folder.ID.ToString();
561 param["agentID"] = folder.agentID.ToString(); 561 param["agentID"] = folder.AgentID.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);
565 param["version"] = Convert.ToString(folder.version); 565 param["version"] = Convert.ToString(folder.Version);
566 566
567 try 567 try
568 { 568 {
@@ -589,13 +589,13 @@ namespace OpenSim.Data.MSSQL
589 "type = @type," + 589 "type = @type," +
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.folderID.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.AgentID.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);
597 SqlParameter param6 = new SqlParameter("@version", folder.version); 597 SqlParameter param6 = new SqlParameter("@version", folder.Version);
598 SqlParameter param7 = new SqlParameter("@keyFolderID", folder.folderID.ToString()); 598 SqlParameter param7 = new SqlParameter("@keyFolderID", folder.ID.ToString());
599 command.Parameters.Add(param1); 599 command.Parameters.Add(param1);
600 command.Parameters.Add(param2); 600 command.Parameters.Add(param2);
601 command.Parameters.Add(param3); 601 command.Parameters.Add(param3);
@@ -623,9 +623,9 @@ namespace OpenSim.Data.MSSQL
623 SqlCommand command = new SqlCommand("UPDATE inventoryfolders set folderID = @folderID, " + 623 SqlCommand command = new SqlCommand("UPDATE inventoryfolders set folderID = @folderID, " +
624 "parentFolderID = @parentFolderID," + 624 "parentFolderID = @parentFolderID," +
625 "folderID = @keyFolderID;", database.getConnection()); 625 "folderID = @keyFolderID;", database.getConnection());
626 SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToString()); 626 SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString());
627 SqlParameter param2 = new SqlParameter("@parentFolderID", folder.parentID.ToString()); 627 SqlParameter param2 = new SqlParameter("@parentFolderID", folder.ParentID.ToString());
628 SqlParameter param3 = new SqlParameter("@keyFolderID", folder.folderID.ToString()); 628 SqlParameter param3 = new SqlParameter("@keyFolderID", folder.ID.ToString());
629 command.Parameters.Add(param1); 629 command.Parameters.Add(param1);
630 command.Parameters.Add(param2); 630 command.Parameters.Add(param2);
631 command.Parameters.Add(param3); 631 command.Parameters.Add(param3);
@@ -660,7 +660,7 @@ namespace OpenSim.Data.MSSQL
660 getInventoryFolders(ref folders, parentID); 660 getInventoryFolders(ref folders, parentID);
661 661
662 for (int i = 0; i < folders.Count; i++) 662 for (int i = 0; i < folders.Count; i++)
663 getInventoryFolders(ref folders, folders[i].folderID); 663 getInventoryFolders(ref folders, folders[i].ID);
664 664
665 return folders; 665 return folders;
666 } 666 }
@@ -716,8 +716,8 @@ namespace OpenSim.Data.MSSQL
716 //Delete all sub-folders 716 //Delete all sub-folders
717 foreach (InventoryFolderBase f in subFolders) 717 foreach (InventoryFolderBase f in subFolders)
718 { 718 {
719 deleteOneFolder(f.folderID); 719 deleteOneFolder(f.ID);
720 deleteItemsInFolder(f.folderID); 720 deleteItemsInFolder(f.ID);
721 } 721 }
722 722
723 //Delete the actual row 723 //Delete the actual row
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 6bb7a53..6cc8998 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -381,12 +381,12 @@ 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.AgentID = new LLUUID((string) reader["agentID"]);
385 folder.parentID = new LLUUID((string) reader["parentFolderID"]); 385 folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
386 folder.folderID = 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"];
388 folder.type = (short) reader["type"]; 388 folder.Type = (short) reader["type"];
389 folder.version = (ushort) ((int) reader["version"]); 389 folder.Version = (ushort) ((int) reader["version"]);
390 return folder; 390 return folder;
391 } 391 }
392 catch (Exception e) 392 catch (Exception e)
@@ -507,12 +507,12 @@ namespace OpenSim.Data.MySQL
507 sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)"; 507 sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)";
508 508
509 MySqlCommand cmd = new MySqlCommand(sql, database.Connection); 509 MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
510 cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToString()); 510 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
511 cmd.Parameters.AddWithValue("?agentID", folder.agentID.ToString()); 511 cmd.Parameters.AddWithValue("?agentID", folder.AgentID.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);
515 cmd.Parameters.AddWithValue("?version", folder.version); 515 cmd.Parameters.AddWithValue("?version", folder.Version);
516 516
517 try 517 try
518 { 518 {
@@ -545,8 +545,8 @@ namespace OpenSim.Data.MySQL
545 "UPDATE inventoryfolders SET parentFolderID=?parentFolderID WHERE folderID=?folderID"; 545 "UPDATE inventoryfolders SET parentFolderID=?parentFolderID WHERE folderID=?folderID";
546 546
547 MySqlCommand cmd = new MySqlCommand(sql, database.Connection); 547 MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
548 cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToString()); 548 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
549 cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToString()); 549 cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
550 550
551 try 551 try
552 { 552 {
@@ -581,7 +581,7 @@ namespace OpenSim.Data.MySQL
581 getInventoryFolders(ref folders, parentID); 581 getInventoryFolders(ref folders, parentID);
582 582
583 for (int i = 0; i < folders.Count; i++) 583 for (int i = 0; i < folders.Count; i++)
584 getInventoryFolders(ref folders, folders[i].folderID); 584 getInventoryFolders(ref folders, folders[i].ID);
585 585
586 return folders; 586 return folders;
587 } 587 }
@@ -637,8 +637,8 @@ namespace OpenSim.Data.MySQL
637 //Delete all sub-folders 637 //Delete all sub-folders
638 foreach (InventoryFolderBase f in subFolders) 638 foreach (InventoryFolderBase f in subFolders)
639 { 639 {
640 deleteOneFolder(f.folderID); 640 deleteOneFolder(f.ID);
641 deleteItemsInFolder(f.folderID); 641 deleteItemsInFolder(f.ID);
642 } 642 }
643 643
644 //Delete the actual row 644 //Delete the actual row
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index ba1d3e9..6bc2e62 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Data.NHibernate
180 /// <param name="folder">The folder to be created</param> 180 /// <param name="folder">The folder to be created</param>
181 public void addInventoryFolder(InventoryFolderBase folder) 181 public void addInventoryFolder(InventoryFolderBase folder)
182 { 182 {
183 if (!ExistsFolder(folder.folderID)) { 183 if (!ExistsFolder(folder.ID)) {
184 using(ISession session = factory.OpenSession()) { 184 using(ISession session = factory.OpenSession()) {
185 using(ITransaction transaction = session.BeginTransaction()) { 185 using(ITransaction transaction = session.BeginTransaction()) {
186 session.Save(folder); 186 session.Save(folder);
@@ -188,7 +188,7 @@ namespace OpenSim.Data.NHibernate
188 } 188 }
189 } 189 }
190 } else { 190 } else {
191 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists, updating instead", folder.folderID); 191 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists, updating instead", folder.ID);
192 updateInventoryFolder(folder); 192 updateInventoryFolder(folder);
193 } 193 }
194 } 194 }
@@ -199,7 +199,7 @@ namespace OpenSim.Data.NHibernate
199 /// <param name="folder">The updated folder</param> 199 /// <param name="folder">The updated folder</param>
200 public void updateInventoryFolder(InventoryFolderBase folder) 200 public void updateInventoryFolder(InventoryFolderBase folder)
201 { 201 {
202 if (ExistsFolder(folder.folderID)) { 202 if (ExistsFolder(folder.ID)) {
203 using(ISession session = factory.OpenSession()) { 203 using(ISession session = factory.OpenSession()) {
204 using(ITransaction transaction = session.BeginTransaction()) { 204 using(ITransaction transaction = session.BeginTransaction()) {
205 session.Update(folder); 205 session.Update(folder);
@@ -207,7 +207,7 @@ namespace OpenSim.Data.NHibernate
207 } 207 }
208 } 208 }
209 } else { 209 } else {
210 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists", folder.folderID); 210 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists", folder.ID);
211 } 211 }
212 } 212 }
213 213
@@ -375,7 +375,7 @@ namespace OpenSim.Data.NHibernate
375 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID)); 375 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID));
376 376
377 for (int i = 0; i < folders.Count; i++) 377 for (int i = 0; i < folders.Count; i++)
378 getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].folderID)); 378 getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].ID));
379 379
380 return folders; 380 return folders;
381 } 381 }
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index f0ff7c9..e8663b4 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -132,11 +132,11 @@ namespace OpenSim.Data.SQLite
132 { 132 {
133 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"]; 133 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
134 134
135 DataRow inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(folder.folderID)); 135 DataRow inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(folder.ID));
136 if (inventoryRow == null) 136 if (inventoryRow == null)
137 { 137 {
138 if (! add) 138 if (! add)
139 m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existant inventory folder: {0}", folder.folderID); 139 m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existant inventory folder: {0}", folder.ID);
140 140
141 inventoryRow = inventoryFolderTable.NewRow(); 141 inventoryRow = inventoryFolderTable.NewRow();
142 fillFolderRow(inventoryRow, folder); 142 fillFolderRow(inventoryRow, folder);
@@ -145,7 +145,7 @@ namespace OpenSim.Data.SQLite
145 else 145 else
146 { 146 {
147 if (add) 147 if (add)
148 m_log.ErrorFormat("Interface Misuse: Attempting to Add inventory folder that already exists: {0}", folder.folderID); 148 m_log.ErrorFormat("Interface Misuse: Attempting to Add inventory folder that already exists: {0}", folder.ID);
149 149
150 fillFolderRow(inventoryRow, folder); 150 fillFolderRow(inventoryRow, folder);
151 } 151 }
@@ -160,7 +160,7 @@ namespace OpenSim.Data.SQLite
160 { 160 {
161 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"]; 161 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
162 162
163 DataRow inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(folder.folderID)); 163 DataRow inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(folder.ID));
164 if (inventoryRow == null) 164 if (inventoryRow == null)
165 { 165 {
166 inventoryRow = inventoryFolderTable.NewRow(); 166 inventoryRow = inventoryFolderTable.NewRow();
@@ -339,7 +339,7 @@ namespace OpenSim.Data.SQLite
339 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID)); 339 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID));
340 340
341 for (int i = 0; i < folders.Count; i++) 341 for (int i = 0; i < folders.Count; i++)
342 getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].folderID)); 342 getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].ID));
343 343
344 return folders; 344 return folders;
345 } 345 }
@@ -488,10 +488,10 @@ namespace OpenSim.Data.SQLite
488 //Delete all sub-folders 488 //Delete all sub-folders
489 foreach (InventoryFolderBase f in subFolders) 489 foreach (InventoryFolderBase f in subFolders)
490 { 490 {
491 inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(f.folderID)); 491 inventoryRow = inventoryFolderTable.Rows.Find(Util.ToRawUuidString(f.ID));
492 if (inventoryRow != null) 492 if (inventoryRow != null)
493 { 493 {
494 deleteItemsInFolder(Util.ToRawUuidString(f.folderID)); 494 deleteItemsInFolder(Util.ToRawUuidString(f.ID));
495 inventoryRow.Delete(); 495 inventoryRow.Delete();
496 } 496 }
497 } 497 }
@@ -590,29 +590,29 @@ namespace OpenSim.Data.SQLite
590 private InventoryFolderBase buildFolder(DataRow row) 590 private InventoryFolderBase buildFolder(DataRow row)
591 { 591 {
592 InventoryFolderBase folder = new InventoryFolderBase(); 592 InventoryFolderBase folder = new InventoryFolderBase();
593 folder.folderID = 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.AgentID = 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"]);
599 return folder; 599 return folder;
600 } 600 }
601 601
602 private void fillFolderRow(DataRow row, InventoryFolderBase folder) 602 private void fillFolderRow(DataRow row, InventoryFolderBase folder)
603 { 603 {
604 row["UUID"] = Util.ToRawUuidString(folder.folderID); 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.AgentID);
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;
610 } 610 }
611 611
612 private void moveFolderRow(DataRow row, InventoryFolderBase folder) 612 private void moveFolderRow(DataRow row, InventoryFolderBase folder)
613 { 613 {
614 row["UUID"] = Util.ToRawUuidString(folder.folderID); 614 row["UUID"] = Util.ToRawUuidString(folder.ID);
615 row["parentID"] = Util.ToRawUuidString(folder.parentID); 615 row["parentID"] = Util.ToRawUuidString(folder.ParentID);
616 } 616 }
617 617
618 /*********************************************************************** 618 /***********************************************************************
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index cb1eb5a..e39333b 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
60 /// <param name="folder"></param> 60 /// <param name="folder"></param>
61 private void AddPendingFolder(InventoryFolderImpl folder) 61 private void AddPendingFolder(InventoryFolderImpl folder)
62 { 62 {
63 LLUUID parentFolderId = folder.parentID; 63 LLUUID parentFolderId = folder.ParentID;
64 64
65 if (pendingCategorizationFolders.ContainsKey(parentFolderId)) 65 if (pendingCategorizationFolders.ContainsKey(parentFolderId))
66 { 66 {
@@ -83,17 +83,17 @@ namespace OpenSim.Framework.Communications.Cache
83 /// </param> 83 /// </param>
84 private void ResolvePendingFolders(InventoryFolderImpl parent) 84 private void ResolvePendingFolders(InventoryFolderImpl parent)
85 { 85 {
86 if (pendingCategorizationFolders.ContainsKey(parent.folderID)) 86 if (pendingCategorizationFolders.ContainsKey(parent.ID))
87 { 87 {
88 foreach (InventoryFolderImpl folder in pendingCategorizationFolders[parent.folderID]) 88 foreach (InventoryFolderImpl folder in pendingCategorizationFolders[parent.ID])
89 { 89 {
90// m_log.DebugFormat( 90// m_log.DebugFormat(
91// "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}", 91// "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}",
92// folder.name, folder.folderID, parent.name, parent.folderID); 92// folder.name, folder.folderID, parent.name, parent.folderID);
93 93
94 if (!parent.SubFolders.ContainsKey(folder.folderID)) 94 if (!parent.SubFolders.ContainsKey(folder.ID))
95 { 95 {
96 parent.SubFolders.Add(folder.folderID, folder); 96 parent.SubFolders.Add(folder.ID, folder);
97 } 97 }
98 } 98 }
99 } 99 }
@@ -118,16 +118,16 @@ namespace OpenSim.Framework.Communications.Cache
118 { 118 {
119 if (RootFolder == null) 119 if (RootFolder == null)
120 { 120 {
121 if (folderInfo.parentID == LLUUID.Zero) 121 if (folderInfo.ParentID == LLUUID.Zero)
122 { 122 {
123 RootFolder = folderInfo; 123 RootFolder = folderInfo;
124 } 124 }
125 } 125 }
126 else if (RootFolder.folderID == folderInfo.parentID) 126 else if (RootFolder.ID == folderInfo.ParentID)
127 { 127 {
128 if (!RootFolder.SubFolders.ContainsKey(folderInfo.folderID)) 128 if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID))
129 { 129 {
130 RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo); 130 RootFolder.SubFolders.Add(folderInfo.ID, folderInfo);
131 } 131 }
132 else 132 else
133 { 133 {
@@ -136,12 +136,12 @@ namespace OpenSim.Framework.Communications.Cache
136 } 136 }
137 else 137 else
138 { 138 {
139 InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.parentID); 139 InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.ParentID);
140 if (folder != null) 140 if (folder != null)
141 { 141 {
142 if (!folder.SubFolders.ContainsKey(folderInfo.folderID)) 142 if (!folder.SubFolders.ContainsKey(folderInfo.ID))
143 { 143 {
144 folder.SubFolders.Add(folderInfo.folderID, folderInfo); 144 folder.SubFolders.Add(folderInfo.ID, folderInfo);
145 } 145 }
146 } 146 }
147 else 147 else
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Cache
171 { 171 {
172 if ((userID == UserProfile.UUID) && (RootFolder != null)) 172 if ((userID == UserProfile.UUID) && (RootFolder != null))
173 { 173 {
174 if (itemInfo.Folder == RootFolder.folderID) 174 if (itemInfo.Folder == RootFolder.ID)
175 { 175 {
176 if (!RootFolder.Items.ContainsKey(itemInfo.ID)) 176 if (!RootFolder.Items.ContainsKey(itemInfo.ID))
177 { 177 {
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 20edf51..37907a0 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -45,12 +45,12 @@ 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 AgentID = folderbase.AgentID;
49 folderID = folderbase.folderID; 49 ID = folderbase.ID;
50 name = folderbase.name; 50 Name = folderbase.Name;
51 parentID = folderbase.parentID; 51 ParentID = folderbase.ParentID;
52 type = folderbase.type; 52 Type = folderbase.Type;
53 version = folderbase.version; 53 Version = folderbase.Version;
54 } 54 }
55 55
56 public InventoryFolderImpl() 56 public InventoryFolderImpl()
@@ -63,12 +63,12 @@ namespace OpenSim.Framework.Communications.Cache
63 if (!SubFolders.ContainsKey(folderID)) 63 if (!SubFolders.ContainsKey(folderID))
64 { 64 {
65 InventoryFolderImpl subFold = new InventoryFolderImpl(); 65 InventoryFolderImpl subFold = new InventoryFolderImpl();
66 subFold.name = folderName; 66 subFold.Name = folderName;
67 subFold.folderID = folderID; 67 subFold.ID = folderID;
68 subFold.type = (short) type; 68 subFold.Type = (short) type;
69 subFold.parentID = this.folderID; 69 subFold.ParentID = this.ID;
70 subFold.agentID = agentID; 70 subFold.AgentID = AgentID;
71 SubFolders.Add(subFold.folderID, subFold); 71 SubFolders.Add(subFold.ID, subFold);
72 return subFold; 72 return subFold;
73 } 73 }
74 return null; 74 return null;
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 12a07eb..cb82850 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -56,14 +56,14 @@ 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 AgentID = libOwner;
60 folderID = 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;
63 type = (short) 8; 63 Type = (short) 8;
64 version = (ushort) 1; 64 Version = (ushort) 1;
65 65
66 libraryFolders.Add(folderID, this); 66 libraryFolders.Add(ID, this);
67 67
68 LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); 68 LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml"));
69 69
@@ -172,20 +172,20 @@ namespace OpenSim.Framework.Communications.Cache
172 { 172 {
173 InventoryFolderImpl folderInfo = new InventoryFolderImpl(); 173 InventoryFolderImpl folderInfo = new InventoryFolderImpl();
174 174
175 folderInfo.folderID = new LLUUID(config.GetString("folderID", folderID.ToString())); 175 folderInfo.ID = new LLUUID(config.GetString("folderID", ID.ToString()));
176 folderInfo.name = config.GetString("name", "unknown"); 176 folderInfo.Name = config.GetString("name", "unknown");
177 folderInfo.parentID = new LLUUID(config.GetString("parentFolderID", folderID.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.AgentID = libOwner;
181 folderInfo.version = 1; 181 folderInfo.Version = 1;
182 182
183 if (libraryFolders.ContainsKey(folderInfo.parentID)) 183 if (libraryFolders.ContainsKey(folderInfo.ParentID))
184 { 184 {
185 InventoryFolderImpl parentFolder = libraryFolders[folderInfo.parentID]; 185 InventoryFolderImpl parentFolder = libraryFolders[folderInfo.ParentID];
186 186
187 libraryFolders.Add(folderInfo.folderID, folderInfo); 187 libraryFolders.Add(folderInfo.ID, folderInfo);
188 parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); 188 parentFolder.SubFolders.Add(folderInfo.ID, folderInfo);
189 189
190// m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID); 190// m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID);
191 } 191 }
@@ -193,7 +193,7 @@ namespace OpenSim.Framework.Communications.Cache
193 { 193 {
194 m_log.WarnFormat( 194 m_log.WarnFormat(
195 "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!", 195 "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!",
196 folderInfo.name, folderInfo.folderID, folderInfo.parentID); 196 folderInfo.Name, folderInfo.ID, folderInfo.ParentID);
197 } 197 }
198 } 198 }
199 199
@@ -206,9 +206,9 @@ namespace OpenSim.Framework.Communications.Cache
206 InventoryItemBase item = new InventoryItemBase(); 206 InventoryItemBase item = new InventoryItemBase();
207 item.Owner = libOwner; 207 item.Owner = libOwner;
208 item.Creator = libOwner; 208 item.Creator = libOwner;
209 item.ID = new LLUUID(config.GetString("inventoryID", folderID.ToString())); 209 item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString()));
210 item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); 210 item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
211 item.Folder = new LLUUID(config.GetString("folderID", folderID.ToString())); 211 item.Folder = new LLUUID(config.GetString("folderID", ID.ToString()));
212 item.Description = config.GetString("description", System.String.Empty); 212 item.Description = config.GetString("description", System.String.Empty);
213 item.Name = config.GetString("name", System.String.Empty); 213 item.Name = config.GetString("name", System.String.Empty);
214 item.AssetType = config.GetInt("assetType", 0); 214 item.AssetType = config.GetInt("assetType", 0);
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index c3f51da..6f11d60 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Framework.Communications.Cache
105 { 105 {
106 if (userProfile.RootFolder != null) 106 if (userProfile.RootFolder != null)
107 { 107 {
108 if (userProfile.RootFolder.folderID == parentID) 108 if (userProfile.RootFolder.ID == parentID)
109 { 109 {
110 InventoryFolderImpl createdFolder = 110 InventoryFolderImpl createdFolder =
111 userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType); 111 userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
@@ -113,12 +113,12 @@ 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.AgentID = createdFolder.AgentID;
117 createdBaseFolder.folderID = createdFolder.folderID; 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;
120 createdBaseFolder.type = createdFolder.type; 120 createdBaseFolder.Type = createdFolder.Type;
121 createdBaseFolder.version = createdFolder.version; 121 createdBaseFolder.Version = createdFolder.Version;
122 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder); 122 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder);
123 } 123 }
124 } 124 }
@@ -156,12 +156,12 @@ 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.AgentID = remoteClient.AgentId;
160 baseFolder.folderID = folderID; 160 baseFolder.ID = folderID;
161 baseFolder.name = name; 161 baseFolder.Name = name;
162 baseFolder.parentID = parentID; 162 baseFolder.ParentID = parentID;
163 baseFolder.type = (short) type; 163 baseFolder.Type = (short) type;
164 baseFolder.version = userProfile.RootFolder.version; 164 baseFolder.Version = userProfile.RootFolder.Version;
165 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, baseFolder); 165 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, baseFolder);
166 } 166 }
167 } 167 }
@@ -176,9 +176,9 @@ 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.AgentID = remoteClient.AgentId;
180 baseFolder.folderID = 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);
183 } 183 }
184 } 184 }
@@ -199,10 +199,10 @@ namespace OpenSim.Framework.Communications.Cache
199 // XXX We're not handling sortOrder yet! 199 // XXX We're not handling sortOrder yet!
200 200
201 InventoryFolderImpl fold = null; 201 InventoryFolderImpl fold = null;
202 if (folderID == libraryRoot.folderID) 202 if (folderID == libraryRoot.ID)
203 { 203 {
204 remoteClient.SendInventoryFolderDetails( 204 remoteClient.SendInventoryFolderDetails(
205 libraryRoot.agentID, libraryRoot.folderID, libraryRoot.RequestListOfItems(), 205 libraryRoot.AgentID, 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.AgentID, folderID, fold.RequestListOfItems(),
215 fold.RequestListOfFolders(), fetchFolders, fetchItems); 215 fold.RequestListOfFolders(), fetchFolders, fetchItems);
216 216
217 return; 217 return;
@@ -242,7 +242,7 @@ namespace OpenSim.Framework.Communications.Cache
242 242
243 if (userProfile.RootFolder != null) 243 if (userProfile.RootFolder != null)
244 { 244 {
245 if (userProfile.RootFolder.folderID == folderID) 245 if (userProfile.RootFolder.ID == folderID)
246 { 246 {
247// m_log.DebugFormat( 247// m_log.DebugFormat(
248// "[AGENT INVENTORY]: Found root folder {0} for client {1}", 248// "[AGENT INVENTORY]: Found root folder {0} for client {1}",
@@ -301,7 +301,7 @@ namespace OpenSim.Framework.Communications.Cache
301 // if (fetchItems) 301 // if (fetchItems)
302 // { 302 // {
303 InventoryFolderImpl fold = null; 303 InventoryFolderImpl fold = null;
304 if (folderID == libraryRoot.folderID) 304 if (folderID == libraryRoot.ID)
305 { 305 {
306 return libraryRoot.RequestListOfItems(); 306 return libraryRoot.RequestListOfItems();
307 } 307 }
@@ -316,7 +316,7 @@ namespace OpenSim.Framework.Communications.Cache
316 { 316 {
317 if (userProfile.RootFolder != null) 317 if (userProfile.RootFolder != null)
318 { 318 {
319 if (userProfile.RootFolder.folderID == folderID) 319 if (userProfile.RootFolder.ID == folderID)
320 { 320 {
321 return userProfile.RootFolder.RequestListOfItems(); 321 return userProfile.RootFolder.RequestListOfItems();
322 } 322 }
@@ -377,7 +377,7 @@ namespace OpenSim.Framework.Communications.Cache
377 377
378 public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) 378 public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID)
379 { 379 {
380 if (ownerID == libraryRoot.agentID) 380 if (ownerID == libraryRoot.AgentID)
381 { 381 {
382 //Console.WriteLine("request info for library item"); 382 //Console.WriteLine("request info for library item");
383 383
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index d96709d..6b5ef1b 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.AgentID)
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 f41bd27..4abfc5a 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Communications
95 95
96 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) 96 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
97 { 97 {
98 IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID); 98 IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.ID);
99 userFolders.AddRange(folders); 99 userFolders.AddRange(folders);
100 } 100 }
101 101
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications
190 protected void AddFolder(InventoryFolderBase folder) 190 protected void AddFolder(InventoryFolderBase folder)
191 { 191 {
192 m_log.DebugFormat( 192 m_log.DebugFormat(
193 "[INVENTORY SERVICE BASE]: Adding folder {0}, {1} to {2}", folder.name, folder.folderID, folder.parentID); 193 "[INVENTORY SERVICE BASE]: Adding folder {0}, {1} to {2}", folder.Name, folder.ID, folder.ParentID);
194 194
195 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) 195 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
196 { 196 {
@@ -239,141 +239,141 @@ namespace OpenSim.Framework.Communications
239 { 239 {
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.AgentID = user;
244 folder.folderID = 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;
247 folder.version = 1; 247 folder.Version = 1;
248 Folders.Add(folder.folderID, folder); 248 Folders.Add(folder.ID, folder);
249 249
250 LLUUID rootFolder = folder.folderID; 250 LLUUID rootFolder = folder.ID;
251 251
252 folder = new InventoryFolderBase(); 252 folder = new InventoryFolderBase();
253 folder.parentID = rootFolder; 253 folder.ParentID = rootFolder;
254 folder.agentID = user; 254 folder.AgentID = user;
255 folder.folderID = 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;
258 folder.version = 1; 258 folder.Version = 1;
259 Folders.Add(folder.folderID, folder); 259 Folders.Add(folder.ID, folder);
260 260
261 folder = new InventoryFolderBase(); 261 folder = new InventoryFolderBase();
262 folder.parentID = rootFolder; 262 folder.ParentID = rootFolder;
263 folder.agentID = user; 263 folder.AgentID = user;
264 folder.folderID = 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;
267 folder.version = 1; 267 folder.Version = 1;
268 Folders.Add(folder.folderID, folder); 268 Folders.Add(folder.ID, folder);
269 269
270 folder = new InventoryFolderBase(); 270 folder = new InventoryFolderBase();
271 folder.parentID = rootFolder; 271 folder.ParentID = rootFolder;
272 folder.agentID = user; 272 folder.AgentID = user;
273 folder.folderID = 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;
276 folder.version = 1; 276 folder.Version = 1;
277 Folders.Add(folder.folderID, folder); 277 Folders.Add(folder.ID, folder);
278 278
279 folder = new InventoryFolderBase(); 279 folder = new InventoryFolderBase();
280 folder.parentID = rootFolder; 280 folder.ParentID = rootFolder;
281 folder.agentID = user; 281 folder.AgentID = user;
282 folder.folderID = 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;
285 folder.version = 1; 285 folder.Version = 1;
286 Folders.Add(folder.folderID, folder); 286 Folders.Add(folder.ID, folder);
287 287
288 folder = new InventoryFolderBase(); 288 folder = new InventoryFolderBase();
289 folder.parentID = rootFolder; 289 folder.ParentID = rootFolder;
290 folder.agentID = user; 290 folder.AgentID = user;
291 folder.folderID = 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;
294 folder.version = 1; 294 folder.Version = 1;
295 Folders.Add(folder.folderID, folder); 295 Folders.Add(folder.ID, folder);
296 296
297 folder = new InventoryFolderBase(); 297 folder = new InventoryFolderBase();
298 folder.parentID = rootFolder; 298 folder.ParentID = rootFolder;
299 folder.agentID = user; 299 folder.AgentID = user;
300 folder.folderID = 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;
303 folder.version = 1; 303 folder.Version = 1;
304 Folders.Add(folder.folderID, folder); 304 Folders.Add(folder.ID, folder);
305 305
306 folder = new InventoryFolderBase(); 306 folder = new InventoryFolderBase();
307 folder.parentID = rootFolder; 307 folder.ParentID = rootFolder;
308 folder.agentID = user; 308 folder.AgentID = user;
309 folder.folderID = 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;
312 folder.version = 1; 312 folder.Version = 1;
313 Folders.Add(folder.folderID, folder); 313 Folders.Add(folder.ID, folder);
314 314
315 folder = new InventoryFolderBase(); 315 folder = new InventoryFolderBase();
316 folder.parentID = rootFolder; 316 folder.ParentID = rootFolder;
317 folder.agentID = user; 317 folder.AgentID = user;
318 folder.folderID = 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;
321 folder.version = 1; 321 folder.Version = 1;
322 Folders.Add(folder.folderID, folder); 322 Folders.Add(folder.ID, folder);
323 323
324 folder = new InventoryFolderBase(); 324 folder = new InventoryFolderBase();
325 folder.parentID = rootFolder; 325 folder.ParentID = rootFolder;
326 folder.agentID = user; 326 folder.AgentID = user;
327 folder.folderID = LLUUID.Random(); 327 folder.ID = LLUUID.Random();
328 folder.name = "Objects"; 328 folder.Name = "Objects";
329 folder.type = (short)AssetType.Primitive; 329 folder.Type = (short)AssetType.Primitive;
330 folder.version = 1; 330 folder.Version = 1;
331 Folders.Add(folder.folderID, folder); 331 Folders.Add(folder.ID, folder);
332 332
333 folder = new InventoryFolderBase(); 333 folder = new InventoryFolderBase();
334 folder.parentID = rootFolder; 334 folder.ParentID = rootFolder;
335 folder.agentID = user; 335 folder.AgentID = user;
336 folder.folderID = 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;
339 folder.version = 1; 339 folder.Version = 1;
340 Folders.Add(folder.folderID, folder); 340 Folders.Add(folder.ID, folder);
341 341
342 folder = new InventoryFolderBase(); 342 folder = new InventoryFolderBase();
343 folder.parentID = rootFolder; 343 folder.ParentID = rootFolder;
344 folder.agentID = user; 344 folder.AgentID = user;
345 folder.folderID = 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;
348 folder.version = 1; 348 folder.Version = 1;
349 Folders.Add(folder.folderID, folder); 349 Folders.Add(folder.ID, folder);
350 350
351 folder = new InventoryFolderBase(); 351 folder = new InventoryFolderBase();
352 folder.parentID = rootFolder; 352 folder.ParentID = rootFolder;
353 folder.agentID = user; 353 folder.AgentID = user;
354 folder.folderID = 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;
357 folder.version = 1; 357 folder.Version = 1;
358 Folders.Add(folder.folderID, folder); 358 Folders.Add(folder.ID, folder);
359 359
360 folder = new InventoryFolderBase(); 360 folder = new InventoryFolderBase();
361 folder.parentID = rootFolder; 361 folder.ParentID = rootFolder;
362 folder.agentID = user; 362 folder.AgentID = user;
363 folder.folderID = 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;
366 folder.version = 1; 366 folder.Version = 1;
367 Folders.Add(folder.folderID, folder); 367 Folders.Add(folder.ID, folder);
368 368
369 folder = new InventoryFolderBase(); 369 folder = new InventoryFolderBase();
370 folder.parentID = rootFolder; 370 folder.ParentID = rootFolder;
371 folder.agentID = user; 371 folder.AgentID = user;
372 folder.folderID = 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;
375 folder.version = 1; 375 folder.Version = 1;
376 Folders.Add(folder.folderID, folder); 376 Folders.Add(folder.ID, folder);
377 } 377 }
378 } 378 }
379 } 379 }
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 413a934..6f558a0 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -734,11 +734,11 @@ namespace OpenSim.Framework.UserManagement
734 foreach (InventoryFolderBase folder in rootFolders.Values) 734 foreach (InventoryFolderBase folder in rootFolders.Values)
735 { 735 {
736 Hashtable TempHash = new Hashtable(); 736 Hashtable TempHash = new Hashtable();
737 TempHash["name"] = folder.name; 737 TempHash["name"] = folder.Name;
738 TempHash["parent_id"] = folder.parentID.ToString(); 738 TempHash["parent_id"] = folder.ParentID.ToString();
739 TempHash["version"] = (Int32)folder.version; 739 TempHash["version"] = (Int32)folder.Version;
740 TempHash["type_default"] = (Int32)folder.type; 740 TempHash["type_default"] = (Int32)folder.Type;
741 TempHash["folder_id"] = folder.folderID.ToString(); 741 TempHash["folder_id"] = folder.ID.ToString();
742 folderHashes.Add(TempHash); 742 folderHashes.Add(TempHash);
743 } 743 }
744 744
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index bf43577..19d3d40 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -40,31 +40,85 @@ namespace OpenSim.Framework
40 /// <summary> 40 /// <summary>
41 /// The name of the folder (64 characters or less) 41 /// The name of the folder (64 characters or less)
42 /// </summary> 42 /// </summary>
43 public string name; 43 private string _name;
44 44
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 public LLUUID agentID; 48 private LLUUID _agentID;
49 49
50 /// <summary> 50 /// <summary>
51 /// The folder this folder is contained in 51 /// The folder this folder is contained in
52 /// </summary> 52 /// </summary>
53 public LLUUID parentID; 53 private LLUUID _parentID;
54 54
55 /// <summary> 55 /// <summary>
56 /// The UUID for this folder 56 /// The UUID for this folder
57 /// </summary> 57 /// </summary>
58 public LLUUID folderID; 58 private LLUUID _id;
59 59
60 /// <summary> 60 /// <summary>
61 /// Type of items normally stored in this folder 61 /// Type of items normally stored in this folder
62 /// </summary> 62 /// </summary>
63 public short type; 63 private short _type;
64 64
65 /// <summary> 65 /// <summary>
66 /// 66 ///
67 /// </summary> 67 /// </summary>
68 public ushort version; 68 private ushort _version;
69
70 public string Name {
71 get {
72 return _name;
73 }
74 set {
75 _name = value;
76 }
77 }
78
79 public LLUUID AgentID {
80 get {
81 return _agentID;
82 }
83 set {
84 _agentID = value;
85 }
86 }
87
88 public LLUUID ParentID {
89 get {
90 return _parentID;
91 }
92 set {
93 _parentID = value;
94 }
95 }
96
97 public LLUUID ID {
98 get {
99 return _id;
100 }
101 set {
102 _id = value;
103 }
104 }
105
106 public short Type {
107 get {
108 return _type;
109 }
110 set {
111 _type = value;
112 }
113 }
114
115 public ushort Version {
116 get {
117 return _version;
118 }
119 set {
120 _version = value;
121 }
122 }
69 } 123 }
70} 124}
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
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
325 { 325 {
326// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name); 326// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
327 327
328 if (InvFolder.parentID == LLUUID.Zero) 328 if (InvFolder.ParentID == LLUUID.Zero)
329 { 329 {
330 rootID = InvFolder.folderID; 330 rootID = InvFolder.ID;
331 } 331 }
332 TempHash = new Hashtable(); 332 TempHash = new Hashtable();
333 TempHash["name"] = InvFolder.name; 333 TempHash["name"] = InvFolder.Name;
334 TempHash["parent_id"] = InvFolder.parentID.ToString(); 334 TempHash["parent_id"] = InvFolder.ParentID.ToString();
335 TempHash["version"] = (Int32) InvFolder.version; 335 TempHash["version"] = (Int32) InvFolder.Version;
336 TempHash["type_default"] = (Int32) InvFolder.type; 336 TempHash["type_default"] = (Int32) InvFolder.Type;
337 TempHash["folder_id"] = InvFolder.folderID.ToString(); 337 TempHash["folder_id"] = InvFolder.ID.ToString();
338 AgentInventoryArray.Add(TempHash); 338 AgentInventoryArray.Add(TempHash);
339 } 339 }
340 return new InventoryData(AgentInventoryArray, rootID); 340 return new InventoryData(AgentInventoryArray, rootID);
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 4325b93..8391e0a 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1307,10 +1307,10 @@ namespace OpenSim.Region.ClientStack
1307 foreach (InventoryFolderBase folder in folders) 1307 foreach (InventoryFolderBase folder in folders)
1308 { 1308 {
1309 descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock(); 1309 descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock();
1310 descend.FolderData[i].FolderID = folder.folderID; 1310 descend.FolderData[i].FolderID = folder.ID;
1311 descend.FolderData[i].Name = Helpers.StringToField(folder.name); 1311 descend.FolderData[i].Name = Helpers.StringToField(folder.Name);
1312 descend.FolderData[i].ParentID = folder.parentID; 1312 descend.FolderData[i].ParentID = folder.ParentID;
1313 descend.FolderData[i].Type = (sbyte) folder.type; 1313 descend.FolderData[i].Type = (sbyte) folder.Type;
1314 1314
1315 i++; 1315 i++;
1316 count++; 1316 count++;
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index df735a9..bb3db9d 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
49 //need to make sure we send root folder first 49 //need to make sure we send root folder first
50 foreach (InventoryFolderBase folder in folders) 50 foreach (InventoryFolderBase folder in folders)
51 { 51 {
52 if (folder.parentID == LLUUID.Zero) 52 if (folder.ParentID == LLUUID.Zero)
53 { 53 {
54 rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); 54 rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
55 } 55 }
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Communications.Local
59 { 59 {
60 foreach (InventoryFolderBase folder in folders) 60 foreach (InventoryFolderBase folder in folders)
61 { 61 {
62 if (folder.folderID != rootFolder.folderID) 62 if (folder.ID != rootFolder.ID)
63 { 63 {
64 RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); 64 RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
65 } 65 }
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.Local
112 InventoryFolderImpl newFolder = new InventoryFolderImpl(folder); 112 InventoryFolderImpl newFolder = new InventoryFolderImpl(folder);
113 folderCallBack(userID, newFolder); 113 folderCallBack(userID, newFolder);
114 114
115 List<InventoryItemBase> items = RequestFolderItems(newFolder.folderID); 115 List<InventoryItemBase> items = RequestFolderItems(newFolder.ID);
116 foreach (InventoryItemBase item in items) 116 foreach (InventoryItemBase item in items)
117 { 117 {
118 itemCallBack(userID, item); 118 itemCallBack(userID, item);
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 8583e61..4632716 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -229,16 +229,16 @@ namespace OpenSim.Region.Communications.Local
229 Hashtable TempHash; 229 Hashtable TempHash;
230 foreach (InventoryFolderBase InvFolder in folders) 230 foreach (InventoryFolderBase InvFolder in folders)
231 { 231 {
232 if (InvFolder.parentID == LLUUID.Zero) 232 if (InvFolder.ParentID == LLUUID.Zero)
233 { 233 {
234 rootID = InvFolder.folderID; 234 rootID = InvFolder.ID;
235 } 235 }
236 TempHash = new Hashtable(); 236 TempHash = new Hashtable();
237 TempHash["name"] = InvFolder.name; 237 TempHash["name"] = InvFolder.Name;
238 TempHash["parent_id"] = InvFolder.parentID.ToString(); 238 TempHash["parent_id"] = InvFolder.ParentID.ToString();
239 TempHash["version"] = (Int32) InvFolder.version; 239 TempHash["version"] = (Int32) InvFolder.Version;
240 TempHash["type_default"] = (Int32) InvFolder.type; 240 TempHash["type_default"] = (Int32) InvFolder.Type;
241 TempHash["folder_id"] = InvFolder.folderID.ToString(); 241 TempHash["folder_id"] = InvFolder.ID.ToString();
242 AgentInventoryArray.Add(TempHash); 242 AgentInventoryArray.Add(TempHash);
243 } 243 }
244 244
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index ba2e3d7..3a13f71 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Communications.OGS1
107 InventoryRequest request = m_RequestingInventory[userID]; 107 InventoryRequest request = m_RequestingInventory[userID];
108 foreach (InventoryFolderBase folder in response.Folders) 108 foreach (InventoryFolderBase folder in response.Folders)
109 { 109 {
110 if (folder.parentID == LLUUID.Zero) 110 if (folder.ParentID == LLUUID.Zero)
111 { 111 {
112 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); 112 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
113 rootFolder = newfolder; 113 rootFolder = newfolder;
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1
119 { 119 {
120 foreach (InventoryFolderBase folder in response.Folders) 120 foreach (InventoryFolderBase folder in response.Folders)
121 { 121 {
122 if (folder.folderID != rootFolder.folderID) 122 if (folder.ID != rootFolder.ID)
123 { 123 {
124 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); 124 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
125 request.FolderCallBack(userID, newfolder); 125 request.FolderCallBack(userID, newfolder);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 052cb02..87f7ace 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -327,7 +327,7 @@ namespace OpenSim.Region.Environment.Scenes
327 itemCopy.Name = item.Name; 327 itemCopy.Name = item.Name;
328 itemCopy.AssetType = item.AssetType; 328 itemCopy.AssetType = item.AssetType;
329 itemCopy.InvType = item.InvType; 329 itemCopy.InvType = item.InvType;
330 itemCopy.Folder = recipientUserInfo.RootFolder.folderID; 330 itemCopy.Folder = recipientUserInfo.RootFolder.ID;
331 itemCopy.CurrentPermissions = 2147483647; 331 itemCopy.CurrentPermissions = 2147483647;
332 itemCopy.NextPermissions = 2147483647; 332 itemCopy.NextPermissions = 2147483647;
333 itemCopy.EveryOnePermissions = item.EveryOnePermissions; 333 itemCopy.EveryOnePermissions = item.EveryOnePermissions;
generated by cgit v1.1 at 2024-12-17 05:59:23 +0000