aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorOren Hurvitz2013-10-31 11:17:28 +0200
committerOren Hurvitz2014-03-24 18:02:22 +0100
commit0ff61341e479423125daa180eb7ee83bd643939b (patch)
tree2515088611d14927b892cc791d031881122b6c98 /OpenSim
parentIf updating a user's profile notes fails then return an error (diff)
downloadopensim-SC_OLD-0ff61341e479423125daa180eb7ee83bd643939b.zip
opensim-SC_OLD-0ff61341e479423125daa180eb7ee83bd643939b.tar.gz
opensim-SC_OLD-0ff61341e479423125daa180eb7ee83bd643939b.tar.bz2
opensim-SC_OLD-0ff61341e479423125daa180eb7ee83bd643939b.tar.xz
HGAssetService searches for the "HomeURI" setting in several sections: Startup, Hypergrid, HGAssetService
Resolves http://opensimulator.org/mantis/view.php?id=6940
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/HypergridService/HGAssetService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index 84dec8d..5c804d4 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Services.HypergridService
76 if (m_UserAccountService == null) 76 if (m_UserAccountService == null)
77 throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); 77 throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
78 78
79 // legacy configuration [obsolete] 79 m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
80 m_HomeURL = assetConfig.GetString("ProfileServerURI", string.Empty); 80 new string[] { "Startup", "Hypergrid", configName }, string.Empty);
81 // Preferred 81 if (m_HomeURL == string.Empty)
82 m_HomeURL = assetConfig.GetString("HomeURI", m_HomeURL); 82 throw new Exception("[HGAssetService] No HomeURI specified");
83 83
84 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); 84 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
85 85