diff options
author | diva | 2009-05-12 22:48:54 +0000 |
---|---|---|
committer | diva | 2009-05-12 22:48:54 +0000 |
commit | 12a470e6a71217d3324826bfbf12ad7904fed262 (patch) | |
tree | a625bf0c46387ff84bafffa158fd282be307c870 /OpenSim/Region/Framework/Scenes | |
parent | * Adds additional check to MRM rezzing - the host object must be created by t... (diff) | |
download | opensim-SC-12a470e6a71217d3324826bfbf12ad7904fed262.zip opensim-SC-12a470e6a71217d3324826bfbf12ad7904fed262.tar.gz opensim-SC-12a470e6a71217d3324826bfbf12ad7904fed262.tar.bz2 opensim-SC-12a470e6a71217d3324826bfbf12ad7904fed262.tar.xz |
Making SimStatsReporter a little more restrained in requesting the IEstateModule interface.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 91e1f2c..7e310ac 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -115,6 +115,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
115 | 115 | ||
116 | private Timer m_report = new Timer(); | 116 | private Timer m_report = new Timer(); |
117 | 117 | ||
118 | private IEstateModule estateModule; | ||
118 | 119 | ||
119 | public SimStatsReporter(Scene scene) | 120 | public SimStatsReporter(Scene scene) |
120 | { | 121 | { |
@@ -151,7 +152,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
151 | 152 | ||
152 | try | 153 | try |
153 | { | 154 | { |
154 | IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>(); | 155 | if (estateModule == null) |
156 | estateModule = m_scene.RequestModuleInterface<IEstateModule>(); | ||
155 | regionFlags = estateModule != null ? estateModule.GetRegionFlags() : (uint) 0; | 157 | regionFlags = estateModule != null ? estateModule.GetRegionFlags() : (uint) 0; |
156 | } | 158 | } |
157 | catch (Exception) | 159 | catch (Exception) |