diff options
author | Diva Canto | 2010-02-01 07:53:55 -0800 |
---|---|---|
committer | Diva Canto | 2010-02-01 07:53:55 -0800 |
commit | 8466f13976bacad89e2babe4b7357e35f49a5739 (patch) | |
tree | 8d18bfdc0665c6917c98cf60b561eda60fcdc602 /OpenSim | |
parent | Batter debug messages. (diff) | |
download | opensim-SC_OLD-8466f13976bacad89e2babe4b7357e35f49a5739.zip opensim-SC_OLD-8466f13976bacad89e2babe4b7357e35f49a5739.tar.gz opensim-SC_OLD-8466f13976bacad89e2babe4b7357e35f49a5739.tar.bz2 opensim-SC_OLD-8466f13976bacad89e2babe4b7357e35f49a5739.tar.xz |
Bug fix for getting region flags.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 8 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 2 |
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 | |||
200 | 200 | ||
201 | // Let's not override GetRegionRange -- let's get them all from the grid server | 201 | // Let's not override GetRegionRange -- let's get them all from the grid server |
202 | 202 | ||
203 | public override int GetRegionFlags(UUID scopeID, UUID regionID) | ||
204 | { | ||
205 | int flags = m_LocalGridService.GetRegionFlags(scopeID, regionID); | ||
206 | if (flags == -1) | ||
207 | flags = base.GetRegionFlags(scopeID, regionID); | ||
208 | |||
209 | return flags; | ||
210 | } | ||
203 | #endregion | 211 | #endregion |
204 | } | 212 | } |
205 | } | 213 | } |
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 | |||
562 | return rinfos; | 562 | return rinfos; |
563 | } | 563 | } |
564 | 564 | ||
565 | public int GetRegionFlags(UUID scopeID, UUID regionID) | 565 | public virtual int GetRegionFlags(UUID scopeID, UUID regionID) |
566 | { | 566 | { |
567 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 567 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
568 | 568 | ||