Bug fix for getting region flags.

2 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 61a8fff..2c234d2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -200,6 +200,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         // Let's not override GetRegionRange -- let's get them all from the grid server
 
+        public override int GetRegionFlags(UUID scopeID, UUID regionID)
+        {
+            int flags = m_LocalGridService.GetRegionFlags(scopeID, regionID);
+            if (flags == -1)
+                flags = base.GetRegionFlags(scopeID, regionID);
+
+            return flags;
+        }
         #endregion
     }
 }
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index 7c8a3e2..a453d99 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -562,7 +562,7 @@ namespace OpenSim.Services.Connectors
             return rinfos;
         }
 
-        public int GetRegionFlags(UUID scopeID, UUID regionID)
+        public virtual int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();