diff options
author | Diva Canto | 2009-09-27 15:06:44 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-27 15:06:44 -0700 |
commit | 689eea3bad7a7dd7fa8dfdacacd891e1d390e51e (patch) | |
tree | 32257c457bfcbbc55e58b9a6eb53d82e13049edb | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-689eea3bad7a7dd7fa8dfdacacd891e1d390e51e.zip opensim-SC-689eea3bad7a7dd7fa8dfdacacd891e1d390e51e.tar.gz opensim-SC-689eea3bad7a7dd7fa8dfdacacd891e1d390e51e.tar.bz2 opensim-SC-689eea3bad7a7dd7fa8dfdacacd891e1d390e51e.tar.xz |
Guarding the methods under if (m_Enabled)
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index c8062d7..1eb481e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -135,7 +135,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
135 | 135 | ||
136 | public void PostInitialise() | 136 | public void PostInitialise() |
137 | { | 137 | { |
138 | ((ISharedRegionModule)m_GridServiceConnector).PostInitialise(); | 138 | if (m_Enabled) |
139 | ((ISharedRegionModule)m_GridServiceConnector).PostInitialise(); | ||
139 | } | 140 | } |
140 | 141 | ||
141 | public void Close() | 142 | public void Close() |
@@ -157,8 +158,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
157 | 158 | ||
158 | public void RemoveRegion(Scene scene) | 159 | public void RemoveRegion(Scene scene) |
159 | { | 160 | { |
160 | m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); | 161 | if (m_Enabled) |
161 | ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene); | 162 | { |
163 | m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); | ||
164 | ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene); | ||
165 | } | ||
162 | } | 166 | } |
163 | 167 | ||
164 | public void RegionLoaded(Scene scene) | 168 | public void RegionLoaded(Scene scene) |