diff options
| author | Melanie | 2011-01-29 04:47:32 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-29 04:47:32 +0000 |
| commit | 24a768a99b5de94042c7e170cc8aad83ec3a1ebc (patch) | |
| tree | 388c6fca95fda2e69550c7690659339915c590f9 /OpenSim/Region/CoreModules/Avatar | |
| parent | Significantly increase the total number of URL's available. In second life, ... (diff) | |
| parent | Flash out the prim count module (diff) | |
| download | opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.zip opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.gz opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.bz2 opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index 542af25..4a42c93 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | |||
| @@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
| 54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 55 | 55 | ||
| 56 | private Scene m_scene; | 56 | private Scene m_scene; |
| 57 | private IAssetService m_assetService; | 57 | // private IAssetService m_assetService; |
| 58 | private bool m_dumpAssetsToFile = false; | 58 | private bool m_dumpAssetsToFile = false; |
| 59 | 59 | ||
| 60 | #region IRegionModuleBase Members | 60 | #region IRegionModuleBase Members |
| @@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
| 85 | public void RegionLoaded(Scene scene) | 85 | public void RegionLoaded(Scene scene) |
| 86 | { | 86 | { |
| 87 | 87 | ||
| 88 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | 88 | // m_assetService = m_scene.RequestModuleInterface<IAssetService>(); |
| 89 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 89 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
| 90 | } | 90 | } |
| 91 | 91 | ||