diff options
| author | Melanie | 2013-02-23 20:37:09 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-23 20:37:09 +0000 |
| commit | e3ea2c4beefb65ba997beab1509aa996a46f7864 (patch) | |
| tree | 778cba450e788b13f4d000c6e49f3d94bd25f65c /OpenSim/Services/HypergridService/HGInventoryService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | More clarification on the [Groups] section (diff) | |
| download | opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2 opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInventoryService.cs')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index a9661f4..17e83cc 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
| @@ -81,7 +81,7 @@ namespace OpenSim.Services.HypergridService | |||
| 81 | if (m_UserAccountService == null) | 81 | if (m_UserAccountService == null) |
| 82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); | 82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); |
| 83 | 83 | ||
| 84 | m_HomeURL = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName); | 84 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] {"Startup", m_ConfigName}); |
| 85 | 85 | ||
| 86 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 86 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
| 87 | } | 87 | } |