Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs

2 files changed, 24 insertions, 27 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index c12b8d6..c8e1e83 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -82,6 +82,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
 
+        private string m_URL;
+
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
@@ -343,13 +345,13 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private void RegisterCaps(UUID agentID, Caps caps)
         {
-            string capUrl = "/CAPS/" + UUID.Random() + "/";
+            m_URL = "/CAPS/" + UUID.Random() + "/";
 
             // Register this as a poll service           
             PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene);
             
             args.Type = PollServiceEventArgs.EventType.Texture;
-            MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
+            MainServer.Instance.AddPollServiceHTTPHandler(m_URL, args);
 
             string hostName = m_scene.RegionInfo.ExternalHostName;
             uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
@@ -361,20 +363,23 @@ namespace OpenSim.Region.ClientStack.Linden
                 port = MainServer.Instance.SSLPort;
                 protocol = "https";
             }
-            caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+
+            IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
+            if (handler != null)
+                handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", m_URL);
+            else
+                caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, m_URL));
             m_pollservices[agentID] = args;
-            m_capsDict[agentID] = capUrl;
+            m_capsDict[agentID] = m_URL;
         }
 
         private void DeregisterCaps(UUID agentID, Caps caps)
         {
-            string capUrl;
             PollServiceTextureEventArgs args;
-            if (m_capsDict.TryGetValue(agentID, out capUrl))
-            {
-                MainServer.Instance.RemoveHTTPHandler("", capUrl);
-                m_capsDict.Remove(agentID);
-            }
+
+            MainServer.Instance.RemoveHTTPHandler("", m_URL);
+            m_capsDict.Remove(agentID);
+
             if (m_pollservices.TryGetValue(agentID, out args))
             {
                 m_pollservices.Remove(agentID);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 7d9f935..e4d8a20 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.ClientStack.Linden
         /// </summary>
         private OSDMap m_features = new OSDMap();
 
-        private string m_MapImageServerURL = string.Empty;
         private string m_SearchURL = string.Empty;
         private bool m_ExportSupported = false;
 
@@ -78,15 +77,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             IConfig config = source.Configs["SimulatorFeatures"];
             if (config != null)
-            {
-                m_MapImageServerURL = config.GetString("MapImageServerURI", string.Empty);
-                if (m_MapImageServerURL != string.Empty)
-                {
-                    m_MapImageServerURL = m_MapImageServerURL.Trim();
-                    if (!m_MapImageServerURL.EndsWith("/"))
-                        m_MapImageServerURL = m_MapImageServerURL + "/";
-                }
-    
+            {    
                 m_SearchURL = config.GetString("SearchServerURI", string.Empty);
 
                 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
@@ -149,15 +140,16 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_features["PhysicsShapeTypes"] = typesMap;
     
                 // Extra information for viewers that want to use it
-                OSDMap gridServicesMap = new OSDMap();
-                if (m_MapImageServerURL != string.Empty)
-                    gridServicesMap["map-server-url"] = m_MapImageServerURL;
+                // TODO: Take these out of here into their respective modules, like map-server-url
+                OSDMap extrasMap = new OSDMap();
                 if (m_SearchURL != string.Empty)
-                    gridServicesMap["search"] = m_SearchURL;
-                m_features["GridServices"] = gridServicesMap;
-
+                    extrasMap["search-server-url"] = m_SearchURL;
                 if (m_ExportSupported)
-                    m_features["ExportSupported"] = true;
+                    extrasMap["ExportSupported"] = true;
+
+                if (extrasMap.Count > 0)
+                    m_features["OpenSimExtras"] = extrasMap;
+
             }
         }