From 3db4d38645260b0299e082b47b010dddf569bf31 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 6 Oct 2009 09:54:15 -0700
Subject: Removing dependencies on System.Runtime.Remoting.
---
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs | 4 ++++
prebuild.xml | 6 ------
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
index 44e850b..6c89ac8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
@@ -61,6 +61,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
private void OnRegionUp(GridRegion otherRegion)
{
+ // This shouldn't happen
+ if (otherRegion == null)
+ return;
+
m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}",
m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY);
diff --git a/prebuild.xml b/prebuild.xml
index f863ab6..e58b81b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -724,7 +724,6 @@
-
@@ -805,7 +804,6 @@
-
@@ -1539,7 +1537,6 @@
-
@@ -1624,7 +1621,6 @@
-
@@ -1682,7 +1678,6 @@
../../../../bin/
-
@@ -3590,7 +3585,6 @@
-
--
cgit v1.1