aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-07-30 22:19:25 +0100
committerUbitUmarov2016-07-30 22:19:25 +0100
commit7ae421163591e7e3fec8a33791e42d9468b77791 (patch)
treed7477b1555b64b6e85269e67dc6699ccbdb7ca1a /OpenSim
parent test jenkins for error line number (diff)
downloadopensim-SC_OLD-7ae421163591e7e3fec8a33791e42d9468b77791.zip
opensim-SC_OLD-7ae421163591e7e3fec8a33791e42d9468b77791.tar.gz
opensim-SC_OLD-7ae421163591e7e3fec8a33791e42d9468b77791.tar.bz2
opensim-SC_OLD-7ae421163591e7e3fec8a33791e42d9468b77791.tar.xz
test jenkins for the null object
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 3900e7b..55f4380 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -149,8 +149,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
149 149
150 scene.RegisterModuleInterface<IGridService>(this); 150 scene.RegisterModuleInterface<IGridService>(this);
151 151
152 m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo)); 152 GridRegion r = new GridRegion(scene.RegionInfo);
153// scene.EventManager.OnRegionUp += OnRegionUp; 153
154 m_RegionInfoCache.CacheLocal(r);
155
156 scene.EventManager.OnRegionUp += OnRegionUp;
154 } 157 }
155 158
156 public void RemoveRegion(Scene scene) 159 public void RemoveRegion(Scene scene)
@@ -159,7 +162,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
159 return; 162 return;
160 163
161 m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID); 164 m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID);
162 // scene.EventManager.OnRegionUp -= OnRegionUp; 165 scene.EventManager.OnRegionUp -= OnRegionUp;
163 } 166 }
164 167
165 public void RegionLoaded(Scene scene) 168 public void RegionLoaded(Scene scene)