diff options
| author | Diva Canto | 2013-07-09 14:13:51 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:13:51 -0700 |
| commit | d0dfb744b206d3bd002ed72f415f177c6b04226b (patch) | |
| tree | dba29f24667d254371abb726e2842700c189dfdf /OpenSim/Services | |
| parent | Put guards on a bunch of exception-inducing code, as seen in logs from load t... (diff) | |
| parent | BulletSim: add parameter to optionally disable vehicle linear deflection. (diff) | |
| download | opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2 opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 410916f..2567c8f 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
| @@ -54,7 +54,7 @@ namespace OpenSim.Services.HypergridService | |||
| 54 | LogManager.GetLogger( | 54 | LogManager.GetLogger( |
| 55 | MethodBase.GetCurrentMethod().DeclaringType); | 55 | MethodBase.GetCurrentMethod().DeclaringType); |
| 56 | 56 | ||
| 57 | private string m_HomeURL; | 57 | // private string m_HomeURL; |
| 58 | private IUserAccountService m_UserAccountService; | 58 | private IUserAccountService m_UserAccountService; |
| 59 | private IAvatarService m_AvatarService; | 59 | private IAvatarService m_AvatarService; |
| 60 | 60 | ||
| @@ -96,8 +96,8 @@ namespace OpenSim.Services.HypergridService | |||
| 96 | if (m_AvatarService == null) | 96 | if (m_AvatarService == null) |
| 97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); | 97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); |
| 98 | 98 | ||
| 99 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", | 99 | // m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
| 100 | new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); | 100 | // new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); |
| 101 | 101 | ||
| 102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
| 103 | } | 103 | } |