From 8466f13976bacad89e2babe4b7357e35f49a5739 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Mon, 1 Feb 2010 07:53:55 -0800
Subject: [PATCH] Bug fix for getting region flags.

---
 .../Grid/RemoteGridServiceConnector.cs                    | 8 ++++++++
 OpenSim/Services/Connectors/Grid/GridServiceConnector.cs  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 61a8fffd79..2c234d274e 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 7c8a3e29ce..a453d99721 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>();