OpenSimExtras

Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.

2 files changed, 46 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 7f86cff..9e55356 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -719,6 +719,45 @@ namespace OpenSim.Services.Connectors
             return flags;
         }
 
+        public Dictionary<string, object> GetExtraFeatures()
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            Dictionary<string, object> extraFeatures = new Dictionary<string, object>();
+
+            sendData["METHOD"] = "get_grid_extra_features";
+
+            string reply = string.Empty;
+            string uri = m_ServerURI + "/grid";
+
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                                                                  uri,
+                                                                  ServerUtils.BuildQueryString(sendData), m_Auth);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: GetExtraFeatures - Exception when contacting grid server at {0}: {1}", uri, e.Message);
+                return extraFeatures;
+            }
+
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+                
+                if ((replyData != null) && replyData.Count > 0)
+                {
+                    foreach (string key in replyData.Keys)
+                    {
+                        extraFeatures[key] = replyData[key].ToString();
+                    }
+                }
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetExtraServiceURLs received null reply");
+
+            return extraFeatures;
+        }
         #endregion
 
     }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 6b59f94..b031f21 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -402,6 +402,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 return -1;
             }
         }
+        
+        public Dictionary<string, object> GetExtraFeatures()
+        {
+            /// See SimulatorFeaturesModule - Need to get map, search and destination guide
+            Dictionary<string, object> extraFeatures = new Dictionary<string, object>();
+            return extraFeatures;
+        }
 
         #endregion IGridService