Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

13 files changed, 264 insertions, 253 deletions

diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 8d0f7be..f5b5982 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -86,13 +86,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
-            IPEndPoint ext = info.ExternalEndPoint;
-            string uri = "";
-            if (ext != null)
-            {
-                uri = "http://" + ext.Address + ":" + info.HttpPort + "/";
-            }
-            //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
+            string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/" );
+            m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
             XmlRpcResponse response = null;
             try
             {
@@ -193,12 +188,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("get_region", paramList);
-            IPEndPoint ext = gatekeeper.ExternalEndPoint;
-            string uri = "";
-            if (ext != null)
-            {
-                uri = "http://" + ext.Address + ":" + gatekeeper.HttpPort + "/";
-            }
+            string uri = "http://" + ((gatekeeper.ServerURI != null && gatekeeper.ServerURI != string.Empty && !gatekeeper.ServerURI.StartsWith("http:")) ? gatekeeper.ServerURI : gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/");
             m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri);
             XmlRpcResponse response = null;
             try
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 4501937..6d3c64a 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -51,34 +51,49 @@ namespace OpenSim.Services.Connectors.Hypergrid
             MethodBase.GetCurrentMethod().DeclaringType);
 
         string m_ServerURL;
-        Uri m_Uri;
         public UserAgentServiceConnector(string url)
         {
             m_ServerURL = url;
+            // Doing this here, because XML-RPC or mono have some strong ideas about
+            // caching DNS translations.
             try
             {
-                m_Uri = new Uri(m_ServerURL);
+                Uri m_Uri = new Uri(m_ServerURL);
                 IPAddress ip = Util.GetHostFromDNS(m_Uri.Host);
-                m_ServerURL = "http://" + ip.ToString() + ":" + m_Uri.Port;
+                m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); ;
             }
             catch (Exception e)
             {
                 m_log.DebugFormat("[USER AGENT CONNECTOR]: Malformed Uri {0}: {1}", m_ServerURL, e.Message);
             }
+            m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0} ({1})", url, m_ServerURL);
         }
 
         public UserAgentServiceConnector(IConfigSource config)
         {
-        }
+            IConfig serviceConfig = config.Configs["UserAgentService"];
+            if (serviceConfig == null)
+            {
+                m_log.Error("[USER AGENT CONNECTOR]: UserAgentService missing from ini");
+                throw new Exception("UserAgent connector init error");
+            }
 
-        public bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint ipaddress, out string reason)
-        {
-            // not available over remote calls
-            reason = "Method not available over remote calls";
-            return false;
+            string serviceURI = serviceConfig.GetString("UserAgentServerURI",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[USER AGENT CONNECTOR]: No Server URI named in section UserAgentService");
+                throw new Exception("UserAgent connector init error");
+            }
+            m_ServerURL = serviceURI;
+
+            m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL);
         }
 
-        public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, out string reason)
+
+        // The Login service calls this interface with a non-null [client] ipaddress 
+        public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, IPEndPoint ipaddress, out string reason)
         {
             reason = String.Empty;
 
@@ -89,7 +104,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 return false;
             }
 
-            string uri =  m_ServerURL + "/homeagent/" + aCircuit.AgentID + "/";
+            string uri = m_ServerURL + "/homeagent/" + aCircuit.AgentID + "/";
 
             Console.WriteLine("   >>> LoginAgentToGrid <<< " + uri);
 
@@ -101,7 +116,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             //AgentCreateRequest.Headers.Add("Authorization", authKey);
 
             // Fill it in
-            OSDMap args = PackCreateAgentArguments(aCircuit, gatekeeper, destination);
+            OSDMap args = PackCreateAgentArguments(aCircuit, gatekeeper, destination, ipaddress);
 
             string strBuffer = "";
             byte[] buffer = new byte[1];
@@ -198,7 +213,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         }
 
-        protected OSDMap PackCreateAgentArguments(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination)
+
+        // The simulators call this interface
+        public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, out string reason)
+        {
+            return LoginAgentToGrid(aCircuit, gatekeeper, destination, null, out reason);
+        }
+
+        protected OSDMap PackCreateAgentArguments(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, IPEndPoint ipaddress)
         {
             OSDMap args = null;
             try
@@ -216,6 +238,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
             args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
             args["destination_name"] = OSD.FromString(destination.RegionName);
             args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
+            if (ipaddress != null)
+                args["client_ip"] = OSD.FromString(ipaddress.Address.ToString());
 
             return args;
         }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 616b5a7..99e6983 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         private string m_serverUrl = String.Empty;
         private IImprovedAssetCache m_cache;
+        private bool m_Enabled = false;
 
         #region ISharedRegionModule
 
@@ -73,8 +74,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianAssetServiceConnector() { }
         public string Name { get { return "SimianAssetServiceConnector"; } }
-        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IAssetService>(this); } }
-        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IAssetService>(this); } }
+        public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAssetService>(this); } }
+        public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAssetService>(this); } }
         
         #endregion ISharedRegionModule
 
@@ -85,26 +86,29 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "AssetServices", this.Name))
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                IConfig gridConfig = source.Configs["AssetService"];
-                if (gridConfig == null)
+                string name = moduleConfig.GetString("AssetServices", "");
+                if (name == Name)
                 {
-                    m_log.Error("[SIMIAN ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
-                    throw new Exception("Asset connector init error");
-                }
+                    IConfig gridConfig = source.Configs["AssetService"];
+                    if (gridConfig != null)
+                    {
+                        string serviceUrl = gridConfig.GetString("AssetServerURI");
+                        if (!String.IsNullOrEmpty(serviceUrl))
+                        {
+                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                                serviceUrl = serviceUrl + '/';
+                            m_serverUrl = serviceUrl;
+                        }
+                    }
 
-                string serviceUrl = gridConfig.GetString("AssetServerURI");
-                if (String.IsNullOrEmpty(serviceUrl))
-                {
-                    m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI in section AssetService");
-                    throw new Exception("Asset connector init error");
+                    if (String.IsNullOrEmpty(m_serverUrl))
+                        m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector");
+                    else
+                        m_Enabled = true;
                 }
-
-                if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
-                    serviceUrl = serviceUrl + '/';
-
-                m_serverUrl = serviceUrl;
             }
         }
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 7a96a05..68f73ee 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -51,6 +51,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_serverUrl = String.Empty;
+        private bool m_Enabled = false;
 
         #region ISharedRegionModule
 
@@ -61,8 +62,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianAuthenticationServiceConnector() { }
         public string Name { get { return "SimianAuthenticationServiceConnector"; } }
-        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IAuthenticationService>(this); } }
-        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IAuthenticationService>(this); } }
+        public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAuthenticationService>(this); } }
+        public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAuthenticationService>(this); } }
 
         #endregion ISharedRegionModule
 
@@ -73,23 +74,28 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "AuthenticationServices", this.Name))
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                IConfig assetConfig = source.Configs["AuthenticationService"];
-                if (assetConfig == null)
+                string name = moduleConfig.GetString("AuthenticationServices", "");
+                if (name == Name)
                 {
-                    m_log.Error("[SIMIAN AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
-                    throw new Exception("Authentication connector init error");
-                }
+                    IConfig gridConfig = source.Configs["AuthenticationService"];
+                    if (gridConfig != null)
+                    {
+                        string serviceUrl = gridConfig.GetString("AuthenticationServerURI");
+                        if (!String.IsNullOrEmpty(serviceUrl))
+                        {
+                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                                serviceUrl = serviceUrl + '/';
+                            m_serverUrl = serviceUrl;
+                            m_Enabled = true;
+                        }
+                    }
 
-                string serviceURI = assetConfig.GetString("AuthenticationServerURI");
-                if (String.IsNullOrEmpty(serviceURI))
-                {
-                    m_log.Error("[SIMIAN AUTH CONNECTOR]: No Server URI named in section AuthenticationService");
-                    throw new Exception("Authentication connector init error");
+                    if (String.IsNullOrEmpty(m_serverUrl))
+                        m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
                 }
-
-                m_serverUrl = serviceURI;
             }
         }
 
@@ -253,7 +259,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 if (password == simianGridCredential ||
                     "$1$" + password == simianGridCredential ||
                     "$1$" + Utils.MD5String(password) == simianGridCredential ||
-                    Utils.MD5String(password) == simianGridCredential)
+                    Utils.MD5String(password) == simianGridCredential ||
+                    "$1$" + Utils.MD5String(password + ":") == simianGridCredential)
                 {
                     authorizeResult = Authorize(userID);
                     return true;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 734bdd2..7e56bd1 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 //        private static string ZeroID = UUID.Zero.ToString();
 
         private string m_serverUrl = String.Empty;
+        private bool m_Enabled = false;
 
         #region ISharedRegionModule
 
@@ -66,8 +67,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianAvatarServiceConnector() { }
         public string Name { get { return "SimianAvatarServiceConnector"; } }
-        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IAvatarService>(this); } }
-        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IAvatarService>(this); } }
+        public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAvatarService>(this); } }
+        public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAvatarService>(this); } }
 
         #endregion ISharedRegionModule
 
@@ -78,26 +79,28 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "AvatarServices", this.Name))
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                IConfig gridConfig = source.Configs["AvatarService"];
-                if (gridConfig == null)
+                string name = moduleConfig.GetString("AvatarServices", "");
+                if (name == Name)
                 {
-                    m_log.Error("[SIMIAN AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
-                    throw new Exception("Avatar connector init error");
-                }
+                    IConfig gridConfig = source.Configs["AvatarService"];
+                    if (gridConfig != null)
+                    {
+                        string serviceUrl = gridConfig.GetString("AvatarServerURI");
+                        if (!String.IsNullOrEmpty(serviceUrl))
+                        {
+                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                                serviceUrl = serviceUrl + '/';
+                            m_serverUrl = serviceUrl;
+                            m_Enabled = true;
+                        }
+                    }
 
-                string serviceUrl = gridConfig.GetString("AvatarServerURI");
-                if (String.IsNullOrEmpty(serviceUrl))
-                {
-                    m_log.Error("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService");
-                    throw new Exception("Avatar connector init error");
+                    if (String.IsNullOrEmpty(m_serverUrl))
+                        m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
                 }
-
-                if (!serviceUrl.EndsWith("/"))
-                    serviceUrl = serviceUrl + '/';
-
-                m_serverUrl = serviceUrl;
             }
         }
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index 89f3594..5b18aef 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -46,8 +46,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// <summary>
     /// Stores and retrieves friend lists from the SimianGrid backend
     /// </summary>
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianFriendsServiceConnector : IFriendsService, ISharedRegionModule
+    public class SimianFriendsServiceConnector : IFriendsService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -55,20 +54,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         private string m_serverUrl = String.Empty;
 
-        #region ISharedRegionModule
-
-        public Type ReplaceableInterface { get { return null; } }
-        public void RegionLoaded(Scene scene) { }
-        public void PostInitialise() { }
-        public void Close() { }
-
-        public SimianFriendsServiceConnector() { }
-        public string Name { get { return "SimianFriendsServiceConnector"; } }
-        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IFriendsService>(this); } }
-        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IFriendsService>(this); } }
-
-        #endregion ISharedRegionModule
-
         public SimianFriendsServiceConnector(IConfigSource source)
         {
             Initialise(source);
@@ -76,38 +61,29 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            bool isSimianEnabled = false;
-
-            if (source.Configs["Friends"] != null)
-            {
-                string module = source.Configs["Friends"].GetString("Connector");
-                isSimianEnabled = !String.IsNullOrEmpty(module) && module.EndsWith(this.Name);
-            }
-
-            if (isSimianEnabled)
+            IConfig gridConfig = source.Configs["FriendsService"];
+            if (gridConfig != null)
             {
-                IConfig assetConfig = source.Configs["FriendsService"];
-                if (assetConfig == null)
+                string serviceUrl = gridConfig.GetString("FriendsServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
                 {
-                    m_log.Error("[SIMIAN FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
-                    throw new Exception("Friends connector init error");
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
                 }
-
-                string serviceURI = assetConfig.GetString("FriendsServerURI");
-                if (String.IsNullOrEmpty(serviceURI))
-                {
-                    m_log.Error("[SIMIAN FRIENDS CONNECTOR]: No Server URI named in section FriendsService");
-                    throw new Exception("Friends connector init error");
-                }
-
-                m_serverUrl = serviceURI;
             }
+
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN FRIENDS CONNECTOR]: No FriendsServerURI specified, disabling connector");
         }
 
         #region IFriendsService
 
         public FriendInfo[] GetFriends(UUID principalID)
         {
+            if (String.IsNullOrEmpty(m_serverUrl))
+                return new FriendInfo[0];
+
             Dictionary<UUID, FriendInfo> friends = new Dictionary<UUID, FriendInfo>();
 
             OSDArray friendsArray = GetFriended(principalID);
@@ -156,6 +132,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool StoreFriend(UUID principalID, string friend, int flags)
         {
+            if (String.IsNullOrEmpty(m_serverUrl))
+                return true;
+
             NameValueCollection requestArgs = new NameValueCollection
             {
                 { "RequestMethod", "AddGeneric" },
@@ -176,6 +155,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool Delete(UUID principalID, string friend)
         {
+            if (String.IsNullOrEmpty(m_serverUrl))
+                return true;
+
             NameValueCollection requestArgs = new NameValueCollection
             {
                 { "RequestMethod", "RemoveGeneric" },
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index 7d97aaa..847319c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -31,17 +31,3 @@ using Nini.Config;
 
 [assembly: Addin("SimianGrid", "1.0")]
 [assembly: AddinDependency("OpenSim", "0.5")]
-
-public static class Simian
-{
-    public static bool IsSimianEnabled(IConfigSource config, string moduleName, string connectorName)
-    {
-        if (config.Configs["Modules"] != null)
-        {
-            string module = config.Configs["Modules"].GetString(moduleName);
-            return !String.IsNullOrEmpty(module) && module.EndsWith(connectorName);
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 1ddcc75..4fceef6 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -60,6 +60,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         private string m_serverUrl = String.Empty;
         private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
+        private bool m_Enabled = false;
 
         #region ISharedRegionModule
 
@@ -72,21 +73,25 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public string Name { get { return "SimianGridServiceConnector"; } }
         public void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             // Every shared region module has to maintain an indepedent list of
             // currently running regions
             lock (m_scenes)
                 m_scenes[scene.RegionInfo.RegionID] = scene;
 
-            if (!String.IsNullOrEmpty(m_serverUrl))
-                scene.RegisterModuleInterface<IGridService>(this);
+            scene.RegisterModuleInterface<IGridService>(this);
         }
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             lock (m_scenes)
                 m_scenes.Remove(scene.RegionInfo.RegionID);
 
-            if (!String.IsNullOrEmpty(m_serverUrl))
-                scene.UnregisterModuleInterface<IGridService>(this);
+            scene.UnregisterModuleInterface<IGridService>(this);
         }
 
         #endregion ISharedRegionModule
@@ -98,23 +103,28 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "GridServices", this.Name))
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                IConfig gridConfig = source.Configs["GridService"];
-                if (gridConfig == null)
+                string name = moduleConfig.GetString("GridServices", "");
+                if (name == Name)
                 {
-                    m_log.Error("[SIMIAN GRID CONNECTOR]: GridService missing from OpenSim.ini");
-                    throw new Exception("Grid connector init error");
-                }
+                    IConfig gridConfig = source.Configs["GridService"];
+                    if (gridConfig != null)
+                    {
+                        string serviceUrl = gridConfig.GetString("GridServerURI");
+                        if (!String.IsNullOrEmpty(serviceUrl))
+                        {
+                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                                serviceUrl = serviceUrl + '/';
+                            m_serverUrl = serviceUrl;
+                            m_Enabled = true;
+                        }
+                    }
 
-                string serviceUrl = gridConfig.GetString("GridServerURI");
-                if (String.IsNullOrEmpty(serviceUrl))
-                {
-                    m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService");
-                    throw new Exception("Grid connector init error");
+                    if (String.IsNullOrEmpty(m_serverUrl))
+                        m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
                 }
-
-                m_serverUrl = serviceUrl;
             }
         }
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 89c1a5a..eb118ae 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private string m_serverUrl = String.Empty;
         private string m_userServerUrl = String.Empty;
 //        private object m_gestureSyncRoot = new object();
+        private bool m_Enabled = false;
 
         #region ISharedRegionModule
 
@@ -80,8 +81,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianInventoryServiceConnector() { }
         public string Name { get { return "SimianInventoryServiceConnector"; } }
-        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IInventoryService>(this); } }
-        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IInventoryService>(this); } }
+        public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IInventoryService>(this); } }
+        public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IInventoryService>(this); } }
 
         #endregion ISharedRegionModule
 
@@ -92,36 +93,39 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "InventoryServices", this.Name))
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                IConfig gridConfig = source.Configs["InventoryService"];
-                if (gridConfig == null)
+                string name = moduleConfig.GetString("InventoryServices", "");
+                if (name == Name)
                 {
-                    m_log.Error("[SIMIAN INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
-                    throw new Exception("Inventory connector init error");
-                }
-
-                string serviceUrl = gridConfig.GetString("InventoryServerURI");
-                if (String.IsNullOrEmpty(serviceUrl))
-                {
-                    m_log.Error("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section InventoryService");
-                    throw new Exception("Inventory connector init error");
-                }
-
-                m_serverUrl = serviceUrl;
+                    IConfig gridConfig = source.Configs["InventoryService"];
+                    if (gridConfig != null)
+                    {
+                        string serviceUrl = gridConfig.GetString("InventoryServerURI");
+                        if (!String.IsNullOrEmpty(serviceUrl))
+                        {
+                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                                serviceUrl = serviceUrl + '/';
+                            m_serverUrl = serviceUrl;
+
+                            gridConfig = source.Configs["UserAccountService"];
+                            if (gridConfig != null)
+                            {
+                                serviceUrl = gridConfig.GetString("UserAccountServerURI");
+                                if (!String.IsNullOrEmpty(serviceUrl))
+                                {
+                                    m_userServerUrl = serviceUrl;
+                                    m_Enabled = true;
+                                }
+                            }
+                        }
+                    }
 
-                gridConfig = source.Configs["UserAccountService"];
-                if (gridConfig != null)
-                {
-                    serviceUrl = gridConfig.GetString("UserAccountServerURI");
-                    if (!String.IsNullOrEmpty(serviceUrl))
-                        m_userServerUrl = serviceUrl;
-                    else
-                        m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section UserAccountService");
-                }
-                else
-                {
-                    m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini");
+                    if (String.IsNullOrEmpty(m_serverUrl))
+                        m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector");
+                    else if (String.IsNullOrEmpty(m_userServerUrl))
+                        m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
                 }
             }
         }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index ca23e27..074c80f 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         private string m_serverUrl = String.Empty;
         private SimianActivityDetector m_activityDetector;
+        private bool m_Enabled = false;
 
         #region ISharedRegionModule
 
@@ -71,7 +72,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public string Name { get { return "SimianPresenceServiceConnector"; } }
         public void AddRegion(Scene scene)
         {
-            if (!String.IsNullOrEmpty(m_serverUrl))
+            if (m_Enabled)
             {
                 scene.RegisterModuleInterface<IPresenceService>(this);
                 scene.RegisterModuleInterface<IGridUserService>(this);
@@ -83,7 +84,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         }
         public void RemoveRegion(Scene scene)
         {
-            if (!String.IsNullOrEmpty(m_serverUrl))
+            if (m_Enabled)
             {
                 scene.UnregisterModuleInterface<IPresenceService>(this);
                 scene.UnregisterModuleInterface<IGridUserService>(this);
@@ -103,23 +104,28 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "PresenceServices", this.Name))
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                IConfig gridConfig = source.Configs["PresenceService"];
-                if (gridConfig == null)
+                string name = moduleConfig.GetString("PresenceServices", "");
+                if (name == Name)
                 {
-                    m_log.Error("[SIMIAN PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
-                    throw new Exception("Presence connector init error");
+                    IConfig gridConfig = source.Configs["PresenceService"];
+                    if (gridConfig != null)
+                    {
+                        string serviceUrl = gridConfig.GetString("PresenceServerURI");
+                        if (!String.IsNullOrEmpty(serviceUrl))
+                        {
+                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                                serviceUrl = serviceUrl + '/';
+                            m_serverUrl = serviceUrl;
+                            m_Enabled = true;
+                        }
+                    }
+
+                    if (String.IsNullOrEmpty(m_serverUrl))
+                        m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
                 }
-
-                string serviceUrl = gridConfig.GetString("PresenceServerURI");
-                if (String.IsNullOrEmpty(serviceUrl))
-                {
-                    m_log.Error("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService");
-                    throw new Exception("Presence connector init error");
-                }
-
-                m_serverUrl = serviceUrl;
             }
         }
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index d30d880..0ef4974 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -67,6 +67,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_serverUrl = String.Empty;
+        private bool m_Enabled = false;
 
         #region INonSharedRegionModule
         
@@ -76,8 +77,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianProfiles() { }
         public string Name { get { return "SimianProfiles"; } }
-        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { CheckEstateManager(scene); scene.EventManager.OnClientConnect += ClientConnectHandler; } }
-        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.EventManager.OnClientConnect -= ClientConnectHandler; } }
+        public void AddRegion(Scene scene) { if (m_Enabled) { CheckEstateManager(scene); scene.EventManager.OnClientConnect += ClientConnectHandler; } }
+        public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.EventManager.OnClientConnect -= ClientConnectHandler; } }
 
         #endregion INonSharedRegionModule
 
@@ -88,44 +89,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "UserAccountServices", "SimianUserAccountServiceConnector"))
-            {
-                IConfig gridConfig = source.Configs["UserAccountService"];
-                if (gridConfig == null)
-                {
-                    m_log.Error("[SIMIAN PROFILES]: UserAccountService missing from OpenSim.ini");
-                    throw new Exception("Profiles init error");
-                }
-
-                string serviceUrl = gridConfig.GetString("UserAccountServerURI");
-                if (String.IsNullOrEmpty(serviceUrl))
-                {
-                    m_log.Error("[SIMIAN PROFILES]: No UserAccountServerURI in section UserAccountService");
-                    throw new Exception("Profiles init error");
-                }
+            IConfig profileConfig = source.Configs["Profile"];
+            if (profileConfig == null)
+                return;
 
-                if (!serviceUrl.EndsWith("/"))
-                    serviceUrl = serviceUrl + '/';
+            if (profileConfig.GetString("Module", String.Empty) != Name)
+                return;
 
-                m_serverUrl = serviceUrl;
-                IConfig profilesConfig = source.Configs["Profiles"];
-                if (profilesConfig == null)
+            IConfig gridConfig = source.Configs["UserAccountService"];
+            if (gridConfig != null)
+            {
+                string serviceUrl = gridConfig.GetString("UserAccountServerURI");
+                if (!String.IsNullOrEmpty(serviceUrl))
                 {
-                    // Do not run this module by default.
-                    return;
-                }
-                else
-                {
-                    // if profiles aren't enabled, we're not needed.
-                    // if we're not specified as the connector to use, then we're not wanted
-                    if (profilesConfig.GetString("Module", String.Empty) != Name)
-                    {
-
-                        return;
-                    }
-                    m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Initializing {0}", this.Name);
+                    if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                        serviceUrl = serviceUrl + '/';
+                    m_serverUrl = serviceUrl;
                 }
             }
+
+            if (String.IsNullOrEmpty(m_serverUrl))
+                m_log.Info("[SIMIAN PROFILES]: No UserAccountServerURI specified, disabling connector");
         }
 
         private void ClientConnectHandler(IClientCore clientCore)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 56c73ec..deb8695 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         private string m_serverUrl = String.Empty;
         private ExpiringCache<UUID, UserAccount> m_accountCache;
+        private bool m_Enabled = false;
 
         #region ISharedRegionModule
 
@@ -65,8 +66,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianUserAccountServiceConnector() { }
         public string Name { get { return "SimianUserAccountServiceConnector"; } }
-        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IUserAccountService>(this); } }
-        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IUserAccountService>(this); } }
+        public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IUserAccountService>(this); } }
+        public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IUserAccountService>(this); } }
 
         #endregion ISharedRegionModule
 
@@ -77,24 +78,28 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "UserAccountServices", this.Name))
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                IConfig assetConfig = source.Configs["UserAccountService"];
-                if (assetConfig == null)
+                string name = moduleConfig.GetString("UserAccountServices", "");
+                if (name == Name)
                 {
-                    m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
-                    throw new Exception("User account connector init error");
-                }
+                    IConfig gridConfig = source.Configs["UserAccountService"];
+                    if (gridConfig != null)
+                    {
+                        string serviceUrl = gridConfig.GetString("UserAccountServerURI");
+                        if (!String.IsNullOrEmpty(serviceUrl))
+                        {
+                            if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                                serviceUrl = serviceUrl + '/';
+                            m_serverUrl = serviceUrl;
+                            m_Enabled = true;
+                        }
+                    }
 
-                string serviceURI = assetConfig.GetString("UserAccountServerURI");
-                if (String.IsNullOrEmpty(serviceURI))
-                {
-                    m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector");
-                    throw new Exception("User account connector init error");
+                    if (String.IsNullOrEmpty(m_serverUrl))
+                        m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
                 }
-
-                m_accountCache = new ExpiringCache<UUID, UserAccount>();
-                m_serverUrl = serviceURI;
             }
         }
 
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 9e30044..a8ed66d 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -104,17 +104,23 @@ namespace OpenSim.Services.Connectors.Simulation
                 return false;
             }
 
-            // Eventually, we want to use a caps url instead of the agentID
             string uri = string.Empty;
-            try
-            {
-                uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + aCircuit.AgentID + "/";
-            }
-            catch (Exception e)
+
+            // HACK -- Simian grid make it work!!!
+            if (destination.ServerURI != null && destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:"))
+                uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
+            else
             {
-                m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
-                reason = e.Message;
-                return false;
+                try
+                {
+                    uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + aCircuit.AgentID + "/";
+                }
+                catch (Exception e)
+                {
+                    m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
+                    reason = e.Message;
+                    return false;
+                }
             }
 
             //Console.WriteLine("   >>> DoCreateChildAgentCall <<< " + uri);