diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs index 3a0011f..03b4873 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs | |||
@@ -84,13 +84,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
84 | if (localDll == String.Empty) | 84 | if (localDll == String.Empty) |
85 | { | 85 | { |
86 | m_log.Error("[HG INVENTORY CONNECTOR]: No LocalGridInventoryService named in section InventoryService"); | 86 | m_log.Error("[HG INVENTORY CONNECTOR]: No LocalGridInventoryService named in section InventoryService"); |
87 | return; | 87 | //return; |
88 | throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's"); | ||
88 | } | 89 | } |
89 | 90 | ||
90 | if (HGDll == String.Empty) | 91 | if (HGDll == String.Empty) |
91 | { | 92 | { |
92 | m_log.Error("[HG INVENTORY CONNECTOR]: No HypergridInventoryService named in section InventoryService"); | 93 | m_log.Error("[HG INVENTORY CONNECTOR]: No HypergridInventoryService named in section InventoryService"); |
93 | return; | 94 | //return; |
95 | throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's"); | ||
94 | } | 96 | } |
95 | 97 | ||
96 | Object[] args = new Object[] { source }; | 98 | Object[] args = new Object[] { source }; |
@@ -116,7 +118,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
116 | m_LocalGridInventoryURI = inventoryConfig.GetString("InventoryServerURI", string.Empty); | 118 | m_LocalGridInventoryURI = inventoryConfig.GetString("InventoryServerURI", string.Empty); |
117 | 119 | ||
118 | m_Enabled = true; | 120 | m_Enabled = true; |
119 | m_log.Info("[HG INVENTORY CONNECTOR]: HG asset broker enabled"); | 121 | m_log.Info("[HG INVENTORY CONNECTOR]: HG inventory broker enabled"); |
120 | } | 122 | } |
121 | } | 123 | } |
122 | } | 124 | } |
@@ -139,6 +141,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
139 | m_Scene = scene; | 141 | m_Scene = scene; |
140 | // HACK for now. Ugh! | 142 | // HACK for now. Ugh! |
141 | m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService; | 143 | m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService; |
144 | // ugh! | ||
145 | m_UserProfileService.SetInventoryService(this); | ||
146 | scene.CommsManager.UserService.SetInventoryService(this); | ||
147 | |||
148 | m_Initialized = true; | ||
142 | } | 149 | } |
143 | 150 | ||
144 | scene.RegisterModuleInterface<IInventoryService>(this); | 151 | scene.RegisterModuleInterface<IInventoryService>(this); |
@@ -153,7 +160,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
153 | if (!m_Enabled) | 160 | if (!m_Enabled) |
154 | return; | 161 | return; |
155 | 162 | ||
156 | m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled remote inventory for region {0}", scene.RegionInfo.RegionName); | 163 | m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled HG inventory for region {0}", scene.RegionInfo.RegionName); |
157 | 164 | ||
158 | } | 165 | } |
159 | 166 | ||
@@ -161,10 +168,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
161 | 168 | ||
162 | public bool CreateUserInventory(UUID userID) | 169 | public bool CreateUserInventory(UUID userID) |
163 | { | 170 | { |
164 | if (IsLocalGridUser(userID)) | 171 | return m_GridService.CreateUserInventory(userID); |
165 | return m_GridService.CreateUserInventory(userID); | ||
166 | else | ||
167 | return false; | ||
168 | } | 172 | } |
169 | 173 | ||
170 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) | 174 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) |
@@ -187,7 +191,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
187 | else | 191 | else |
188 | { | 192 | { |
189 | UUID sessionID = GetSessionID(userID); | 193 | UUID sessionID = GetSessionID(userID); |
190 | string uri = "http://" + GetUserInventoryURI(userID) + "/" + userID.ToString(); | 194 | string uri = GetUserInventoryURI(userID) + "/" + userID.ToString(); |
191 | m_HGService.GetUserInventory(uri, sessionID, callback); | 195 | m_HGService.GetUserInventory(uri, sessionID, callback); |
192 | } | 196 | } |
193 | } | 197 | } |
@@ -207,7 +211,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
207 | else | 211 | else |
208 | { | 212 | { |
209 | UUID sessionID = GetSessionID(folder.Owner); | 213 | UUID sessionID = GetSessionID(folder.Owner); |
210 | string uri = "http://" + GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); | 214 | string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); |
211 | return m_HGService.AddFolder(uri, folder, sessionID); | 215 | return m_HGService.AddFolder(uri, folder, sessionID); |
212 | } | 216 | } |
213 | } | 217 | } |
@@ -222,7 +226,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
222 | else | 226 | else |
223 | { | 227 | { |
224 | UUID sessionID = GetSessionID(folder.Owner); | 228 | UUID sessionID = GetSessionID(folder.Owner); |
225 | string uri = "http://" + GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); | 229 | string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); |
226 | return m_HGService.UpdateFolder(uri, folder, sessionID); | 230 | return m_HGService.UpdateFolder(uri, folder, sessionID); |
227 | } | 231 | } |
228 | } | 232 | } |
@@ -237,7 +241,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
237 | else | 241 | else |
238 | { | 242 | { |
239 | UUID sessionID = GetSessionID(folder.Owner); | 243 | UUID sessionID = GetSessionID(folder.Owner); |
240 | string uri = "http://" + GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); | 244 | string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); |
241 | return m_HGService.MoveFolder(uri, folder, sessionID); | 245 | return m_HGService.MoveFolder(uri, folder, sessionID); |
242 | } | 246 | } |
243 | } | 247 | } |
@@ -252,7 +256,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
252 | else | 256 | else |
253 | { | 257 | { |
254 | UUID sessionID = GetSessionID(folder.Owner); | 258 | UUID sessionID = GetSessionID(folder.Owner); |
255 | string uri = "http://" + GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); | 259 | string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); |
256 | return m_HGService.PurgeFolder(uri, folder, sessionID); | 260 | return m_HGService.PurgeFolder(uri, folder, sessionID); |
257 | } | 261 | } |
258 | } | 262 | } |
@@ -267,7 +271,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
267 | else | 271 | else |
268 | { | 272 | { |
269 | UUID sessionID = GetSessionID(item.Owner); | 273 | UUID sessionID = GetSessionID(item.Owner); |
270 | string uri = "http://" + GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); | 274 | string uri = GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); |
271 | return m_HGService.AddItem(uri, item, sessionID); | 275 | return m_HGService.AddItem(uri, item, sessionID); |
272 | } | 276 | } |
273 | } | 277 | } |
@@ -282,7 +286,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
282 | else | 286 | else |
283 | { | 287 | { |
284 | UUID sessionID = GetSessionID(item.Owner); | 288 | UUID sessionID = GetSessionID(item.Owner); |
285 | string uri = "http://" + GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); | 289 | string uri = GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); |
286 | return m_HGService.UpdateItem(uri, item, sessionID); | 290 | return m_HGService.UpdateItem(uri, item, sessionID); |
287 | } | 291 | } |
288 | } | 292 | } |
@@ -297,7 +301,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
297 | else | 301 | else |
298 | { | 302 | { |
299 | UUID sessionID = GetSessionID(item.Owner); | 303 | UUID sessionID = GetSessionID(item.Owner); |
300 | string uri = "http://" + GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); | 304 | string uri = GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); |
301 | return m_HGService.DeleteItem(uri, item, sessionID); | 305 | return m_HGService.DeleteItem(uri, item, sessionID); |
302 | } | 306 | } |
303 | } | 307 | } |
@@ -312,7 +316,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
312 | else | 316 | else |
313 | { | 317 | { |
314 | UUID sessionID = GetSessionID(item.Owner); | 318 | UUID sessionID = GetSessionID(item.Owner); |
315 | string uri = "http://" + GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); | 319 | string uri = GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); |
316 | return m_HGService.QueryItem(uri, item, sessionID); | 320 | return m_HGService.QueryItem(uri, item, sessionID); |
317 | } | 321 | } |
318 | } | 322 | } |
@@ -327,7 +331,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
327 | else | 331 | else |
328 | { | 332 | { |
329 | UUID sessionID = GetSessionID(folder.Owner); | 333 | UUID sessionID = GetSessionID(folder.Owner); |
330 | string uri = "http://" + GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); | 334 | string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); |
331 | return m_HGService.QueryFolder(uri, folder, sessionID); | 335 | return m_HGService.QueryFolder(uri, folder, sessionID); |
332 | } | 336 | } |
333 | } | 337 | } |