diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index ae5081c..f0c4926 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using log4net; | 28 | using log4net; |
29 | using Mono.Addins; | 29 | using Mono.Addins; |
30 | using System; | 30 | using System; |
31 | using System.Collections; | ||
31 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
32 | using System.Reflection; | 33 | using System.Reflection; |
33 | using Nini.Config; | 34 | using Nini.Config; |
@@ -349,6 +350,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
349 | 350 | ||
350 | return flags; | 351 | return flags; |
351 | } | 352 | } |
353 | |||
354 | public Dictionary<string, object> GetExtraFeatures() | ||
355 | { | ||
356 | Dictionary<string, object> extraFeatures; | ||
357 | extraFeatures = m_LocalGridService.GetExtraFeatures(); | ||
358 | |||
359 | if (extraFeatures.Count == 0) | ||
360 | extraFeatures = m_RemoteGridService.GetExtraFeatures(); | ||
361 | |||
362 | return extraFeatures; | ||
363 | } | ||
352 | #endregion | 364 | #endregion |
353 | } | 365 | } |
354 | } | 366 | } |