diff options
| author | John Hurliman | 2010-09-03 14:50:42 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-03 14:50:42 -0700 |
| commit | 1e552e88e864da2e168fc4cf4df458688c1eab3d (patch) | |
| tree | 0f3be001473ef0f1f1636749463c86591cb1b4e1 /OpenSim/Services | |
| parent | Make SimianFriendsServiceConnector initialize like the other connectors and g... (diff) | |
| parent | In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ra... (diff) | |
| download | opensim-SC-1e552e88e864da2e168fc4cf4df458688c1eab3d.zip opensim-SC-1e552e88e864da2e168fc4cf4df458688c1eab3d.tar.gz opensim-SC-1e552e88e864da2e168fc4cf4df458688c1eab3d.tar.bz2 opensim-SC-1e552e88e864da2e168fc4cf4df458688c1eab3d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/InventoryService/HGInventoryService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/HGInventoryService.cs b/OpenSim/Services/InventoryService/HGInventoryService.cs index 6e6b019..d62c008 100644 --- a/OpenSim/Services/InventoryService/HGInventoryService.cs +++ b/OpenSim/Services/InventoryService/HGInventoryService.cs | |||
| @@ -44,7 +44,7 @@ namespace OpenSim.Services.InventoryService | |||
| 44 | LogManager.GetLogger( | 44 | LogManager.GetLogger( |
| 45 | MethodBase.GetCurrentMethod().DeclaringType); | 45 | MethodBase.GetCurrentMethod().DeclaringType); |
| 46 | 46 | ||
| 47 | protected IXInventoryData m_Database; | 47 | protected new IXInventoryData m_Database; |
| 48 | 48 | ||
| 49 | public HGInventoryService(IConfigSource config) | 49 | public HGInventoryService(IConfigSource config) |
| 50 | : base(config) | 50 | : base(config) |