diff options
| author | Melanie | 2013-06-06 23:50:03 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-06 23:50:03 +0100 |
| commit | dd7404d850acd4c5b40b4f73d4a62be5106c32ef (patch) | |
| tree | de6e5f47c7f19eba05e1334f76783f8753aa9512 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-dd7404d850acd4c5b40b4f73d4a62be5106c32ef.zip opensim-SC-dd7404d850acd4c5b40b4f73d4a62be5106c32ef.tar.gz opensim-SC-dd7404d850acd4c5b40b4f73d4a62be5106c32ef.tar.bz2 opensim-SC-dd7404d850acd4c5b40b4f73d4a62be5106c32ef.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index e474ef6..58576d1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
| @@ -233,6 +233,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
| 233 | if (sp != null) | 233 | if (sp != null) |
| 234 | { | 234 | { |
| 235 | AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); | 235 | AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); |
| 236 | if (aCircuit == null) | ||
| 237 | return; | ||
| 238 | if (aCircuit.ServiceURLs == null) | ||
| 239 | return; | ||
| 240 | |||
| 236 | if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI")) | 241 | if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI")) |
| 237 | { | 242 | { |
| 238 | inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString(); | 243 | inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString(); |