aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-28 19:35:01 +0000
committerJustin Clarke Casey2008-03-28 19:35:01 +0000
commit0a47a75b8894942e43a132c8479b1b17e7d4e8b5 (patch)
tree34de4749fe3a83f2335667aabf58537845ecab00 /OpenSim/Region
parent* Refactor: Eliminate RequestUsersRoot() redundant method (diff)
downloadopensim-SC_OLD-0a47a75b8894942e43a132c8479b1b17e7d4e8b5.zip
opensim-SC_OLD-0a47a75b8894942e43a132c8479b1b17e7d4e8b5.tar.gz
opensim-SC_OLD-0a47a75b8894942e43a132c8479b1b17e7d4e8b5.tar.bz2
opensim-SC_OLD-0a47a75b8894942e43a132c8479b1b17e7d4e8b5.tar.xz
* Send full inventory folder skeleton to standalone client logins rather than just the root child folders
* This may resolve some current problems with non root child folders on standalone installations. * A fix for the same problem in grid mode will come soon.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs3
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs8
3 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index f154cd8..fc5cc6c 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -42,7 +42,9 @@ namespace OpenSim.Region.Communications.Local
42 public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, 42 public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
43 InventoryItemInfo itemCallBack) 43 InventoryItemInfo itemCallBack)
44 { 44 {
45 List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID); 45 //List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID);
46 List<InventoryFolderBase> folders = GetInventorySkeleton(userID);
47
46 InventoryFolderImpl rootFolder = null; 48 InventoryFolderImpl rootFolder = null;
47 49
48 //need to make sure we send root folder first 50 //need to make sure we send root folder first
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5af0077..6bb505d 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -215,7 +215,8 @@ namespace OpenSim.Region.Communications.Local
215 // See LoginService 215 // See LoginService
216 protected override InventoryData GetInventorySkeleton(LLUUID userID) 216 protected override InventoryData GetInventorySkeleton(LLUUID userID)
217 { 217 {
218 List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID); 218 List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
219 //List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);
219 if (folders.Count > 0) 220 if (folders.Count > 0)
220 { 221 {
221 LLUUID rootID = LLUUID.Zero; 222 LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 3551172..e78fc1a 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -216,6 +216,14 @@ namespace OpenSim.Region.Communications.OGS1
216 public void CreateNewUserInventory(LLUUID user) 216 public void CreateNewUserInventory(LLUUID user)
217 { 217 {
218 } 218 }
219
220 // See IInventoryServices
221 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
222 {
223 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
224
225 return new List<InventoryFolderBase>();
226 }
219 227
220 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID) 228 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
221 { 229 {