diff options
author | Melanie | 2009-12-21 15:48:46 +0000 |
---|---|---|
committer | Melanie | 2009-12-21 15:48:46 +0000 |
commit | 51ecdf014830d8ad8f8ea0d87254de4993fdd107 (patch) | |
tree | b1ea461c34773ed6a22240ffda6122e3ef8c0499 /OpenSim/Region | |
parent | Fixes some incorrect values returned by llGetPrimitiveParams() and osGetLinkP... (diff) | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-51ecdf014830d8ad8f8ea0d87254de4993fdd107.zip opensim-SC-51ecdf014830d8ad8f8ea0d87254de4993fdd107.tar.gz opensim-SC-51ecdf014830d8ad8f8ea0d87254de4993fdd107.tar.bz2 opensim-SC-51ecdf014830d8ad8f8ea0d87254de4993fdd107.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index f073f32..1fdf1ef 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -56,6 +56,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
56 | private ISessionAuthInventoryService m_HGService; | 56 | private ISessionAuthInventoryService m_HGService; |
57 | 57 | ||
58 | private string m_LocalGridInventoryURI = string.Empty; | 58 | private string m_LocalGridInventoryURI = string.Empty; |
59 | |||
60 | private string LocalGridInventory | ||
61 | { | ||
62 | get | ||
63 | { | ||
64 | if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "") | ||
65 | m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL; | ||
66 | return m_LocalGridInventoryURI; | ||
67 | } | ||
68 | } | ||
69 | |||
59 | public Type ReplaceableInterface | 70 | public Type ReplaceableInterface |
60 | { | 71 | { |
61 | get { return null; } | 72 | get { return null; } |
@@ -533,7 +544,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
533 | 544 | ||
534 | string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); | 545 | string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); |
535 | 546 | ||
536 | string uri = m_LocalGridInventoryURI.TrimEnd('/'); | 547 | string uri = LocalGridInventory.TrimEnd('/'); |
537 | 548 | ||
538 | if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) | 549 | if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) |
539 | { | 550 | { |
@@ -545,7 +556,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
545 | 556 | ||
546 | private string GetUserInventoryURI(UUID userID) | 557 | private string GetUserInventoryURI(UUID userID) |
547 | { | 558 | { |
548 | string invURI = m_LocalGridInventoryURI; | 559 | string invURI = LocalGridInventory; |
549 | 560 | ||
550 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); | 561 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); |
551 | if ((uinfo == null) || (uinfo.UserProfile == null)) | 562 | if ((uinfo == null) || (uinfo.UserProfile == null)) |