diff options
author | Justin Clark-Casey (justincc) | 2012-03-28 01:06:18 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-28 01:06:18 +0100 |
commit | cb41fb64beb23c931216f038a50a48fb25d23198 (patch) | |
tree | 122d3c0db4593ac2e3ca2abf1d13b7d22188cedb /OpenSim/Services/HypergridService/HGInventoryService.cs | |
parent | minor: clean up some code formatting in VivoxVoiceModule.cs (diff) | |
parent | Reverse a conditional in XInventory that made updating system folder evrsion ... (diff) | |
download | opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.zip opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.tar.gz opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.tar.bz2 opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index a1287fd..b29d803 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -53,8 +53,6 @@ namespace OpenSim.Services.HypergridService | |||
53 | LogManager.GetLogger( | 53 | LogManager.GetLogger( |
54 | MethodBase.GetCurrentMethod().DeclaringType); | 54 | MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | protected new IXInventoryData m_Database; | ||
57 | |||
58 | private string m_HomeURL; | 56 | private string m_HomeURL; |
59 | private IUserAccountService m_UserAccountService; | 57 | private IUserAccountService m_UserAccountService; |
60 | 58 | ||