aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-11 20:37:26 +0000
committerJustin Clarke Casey2008-04-11 20:37:26 +0000
commitb3f783ae056fd2e8921336a1d459d91c7df97ce3 (patch)
tree0cb69554ade962cdb1db4e853e1da564c1e2f4a9 /OpenSim/Region
parent* Minor refactoring in OGS1InventoryService (diff)
downloadopensim-SC_OLD-b3f783ae056fd2e8921336a1d459d91c7df97ce3.zip
opensim-SC_OLD-b3f783ae056fd2e8921336a1d459d91c7df97ce3.tar.gz
opensim-SC_OLD-b3f783ae056fd2e8921336a1d459d91c7df97ce3.tar.bz2
opensim-SC_OLD-b3f783ae056fd2e8921336a1d459d91c7df97ce3.tar.xz
* Reduce publicly exposed fields on InventoryCollection, which was causing duplicate sets of inventory data to be sent over the grid
* Won't actually fix anything, since we were handling the problem anyway * Also add more doc, fix up debugging messages, etc
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 41ca4fb..fbe905c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.OGS1
94 { 94 {
95 m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + 95 m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " +
96 "Received inventory response for user {0} containing {1} folders and {2} items", 96 "Received inventory response for user {0} containing {1} folders and {2} items",
97 userID, response.Folders.Count, response.AllItems.Count); 97 userID, response.Folders.Count, response.Items.Count);
98 98
99 InventoryFolderImpl rootFolder = null; 99 InventoryFolderImpl rootFolder = null;
100 InventoryRequest request = m_RequestingInventory[userID]; 100 InventoryRequest request = m_RequestingInventory[userID];
@@ -108,6 +108,8 @@ namespace OpenSim.Region.Communications.OGS1
108 { 108 {
109 rootFolder = new InventoryFolderImpl(folder); 109 rootFolder = new InventoryFolderImpl(folder);
110 folders.Add(rootFolder); 110 folders.Add(rootFolder);
111
112 break;
111 } 113 }
112 } 114 }
113 115
@@ -121,11 +123,15 @@ namespace OpenSim.Region.Communications.OGS1
121 } 123 }
122 } 124 }
123 125
124 foreach (InventoryItemBase item in response.AllItems) 126 foreach (InventoryItemBase item in response.Items)
125 { 127 {
126 items.Add(item); 128 items.Add(item);
127 } 129 }
128 } 130 }
131 else
132 {
133 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
134 }
129 135
130 request.Callback(userID, folders, items); 136 request.Callback(userID, folders, items);
131 137