From a0d79e621cc8ee4935dfc2816da75db9c23c1b84 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 30 Jan 2010 15:43:10 -0800
Subject: Bug fix: change HGBroker to a INonSharedRegionModule

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index ecd7002..09798aa 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -183,7 +183,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         public bool IsForeignUser(UUID userID, out string assetServerURL)
         {
             assetServerURL = string.Empty;
-            UserAccount account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID);
+            UserAccount account = null;
+            if (m_Scene.UserAccountService != null)
+                account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID);
+
             if (account == null) // foreign
             {
                 ScenePresence sp = null;
@@ -193,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     if (aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
                     {
                         assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString();
-                        return true;
+                        assetServerURL = assetServerURL.Trim(new char[] { '/' }); return true;
                     }
                 }
             }
-- 
cgit v1.1