86 files changed, 4578 insertions, 1154 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 90c30c8..c57db48 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -153,9 +153,24 @@ namespace OpenSim.Services.AssetService
             return true;
         }
 
+        public virtual bool[] AssetsExist(string[] ids)
+        {
+            try
+            {
+                UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id));
+                return m_Database.AssetsExist(uuid);
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[ASSET SERVICE]: Exception getting assets ", e);
+                return new bool[ids.Length];
+            }
+        }
+        
         public virtual string Store(AssetBase asset)
         {
-            if (!m_Database.ExistsAsset(asset.FullID))
+            bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0];
+            if (!exists)
             {
 //                m_log.DebugFormat(
 //                    "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length);
@@ -189,4 +204,4 @@ namespace OpenSim.Services.AssetService
             return m_Database.Delete(id);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
index 72c2ac4..9717319 100644
--- a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index 6047616..f58b769 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -175,9 +175,16 @@ namespace OpenSim.Services.AssetService
             return true;
         }
 
+        public virtual bool[] AssetsExist(string[] ids)
+        {
+            UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id));
+            return m_Database.AssetsExist(uuid);
+        }
+        
         public virtual string Store(AssetBase asset)
         {
-            if (!m_Database.ExistsAsset(asset.FullID))
+            bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0];
+            if (!exists)
             {
 //                m_log.DebugFormat(
 //                    "[XASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length);
@@ -217,4 +224,4 @@ namespace OpenSim.Services.AssetService
             m_ChainedAssetService.Delete(asset.ID);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
index 8ffeeca..8c63adc 100644
--- a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
index e51d2ca..ce91b56 100644
--- a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
index 3800e62..1778863 100644
--- a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
index 959670c..a3fb11b 100644
--- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 22f27e0..09dcbef 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -28,6 +28,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -46,9 +47,19 @@ namespace OpenSim.Services.Base
 
         public T LoadPlugin<T>(string dllName, Object[] args) where T:class
         {
+<<<<<<< HEAD
+            // The path:type separator : is unfortunate because it collides
+            // with Windows paths like C:\...
+            // When the path provided includes the drive, this fails.
+            // Hence the root/noroot thing going on here.
+            string pathRoot = Path.GetPathRoot(dllName);
+            string noRoot = dllName.Substring(pathRoot.Length);
+            string[] parts = noRoot.Split(new char[] {':'});
+=======
             string pathRoot = Path.GetPathRoot(dllName);
             string noRoot = dllName.Substring(pathRoot.Length);
             string[] parts = noRoot.Split(new char[] { ':' });
+>>>>>>> avn/ubitvar
 
             dllName = pathRoot + parts[0];
 
@@ -82,7 +93,7 @@ namespace OpenSim.Services.Base
                             continue;
 
                         Type typeInterface =
-                                pluginType.GetInterface(interfaceName, true);
+                                pluginType.GetInterface(interfaceName);
                         if (typeInterface != null)
                         {
                             T plug = (T)Activator.CreateInstance(pluginType,
diff --git a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs
new file mode 100644
index 0000000..1dbc0c8
--- /dev/null
+++ b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using IAvatarService = OpenSim.Services.Interfaces.IAvatarService;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors
+{
+    public class AgentPreferencesServicesConnector : BaseServiceConnector, IAgentPreferencesService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+
+        public AgentPreferencesServicesConnector()
+        {
+        }
+
+        public AgentPreferencesServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+
+        public AgentPreferencesServicesConnector(IConfigSource source)
+            : base(source, "AgentPreferencesService")
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["AgentPreferencesService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[AGENT PREFERENCES CONNECTOR]: AgentPreferencesService missing from OpenSim.ini");
+                throw new Exception("Agent Preferences connector init error");
+            }
+
+            string serviceURI = gridConfig.GetString("AgentPreferencesServerURI", String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[AGENT PREFERENCES CONNECTOR]: No Server URI named in section AgentPreferences");
+                throw new Exception("Agent Preferences connector init error");
+            }
+            m_ServerURI = serviceURI;
+
+            base.Initialise(source, "AgentPreferencesService");
+        }
+
+        #region IAgentPreferencesService
+
+        public AgentPrefs GetAgentPreferences(UUID principalID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+
+            string reply = string.Empty;
+            string uri = String.Concat(m_ServerURI, "/agentprefs");
+
+            sendData["METHOD"] = "getagentprefs";
+            sendData["UserID"] = principalID;
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[AGENT PREFS CONNECTOR]: queryString = {0}", reqString);
+
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
+                if (String.IsNullOrEmpty(reply))
+                {
+                    m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: GetAgentPreferences received null or empty reply");
+                    return null;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message);
+            }
+                
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+            if (replyData != null)
+            {
+                if (replyData.ContainsKey("result") &&
+                    (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure"))
+                {
+                    m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: GetAgentPreferences received Failure response");
+                    return null;
+                }
+            }
+            else
+            {
+                m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: GetAgentPreferences received null response");
+                return null;
+            }
+            AgentPrefs prefs = new AgentPrefs(replyData);
+            return prefs;
+        }
+
+        public bool StoreAgentPreferences(AgentPrefs data)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+
+            sendData["METHOD"] = "setagentprefs";
+
+            sendData["PrincipalID"] = data.PrincipalID.ToString();
+            sendData["AccessPrefs"] = data.AccessPrefs;
+            sendData["HoverHeight"] = data.HoverHeight.ToString();
+            sendData["Language"] = data.Language;
+            sendData["LanguageIsPublic"] = data.LanguageIsPublic.ToString();
+            sendData["PermEveryone"] = data.PermEveryone.ToString();
+            sendData["PermGroup"] = data.PermGroup.ToString();
+            sendData["PermNextOwner"] = data.PermNextOwner.ToString();
+
+            string uri = String.Concat(m_ServerURI, "/agentprefs");
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[AGENT PREFS CONNECTOR]: queryString = {0}", reqString);
+
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if (replyData.ContainsKey("result"))
+                    {
+                        if (replyData["result"].ToString().ToLower() == "success")
+                            return true;
+                        else
+                            return false;
+                    }
+                    else
+                    {
+                        m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: StoreAgentPreferences reply data does not contain result field");
+                    }
+
+                }
+                else
+                    m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: StoreAgentPreferences received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message);
+            }
+
+            return false;
+        }
+
+        public string GetLang(UUID principalID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            string reply = string.Empty;
+
+            sendData["METHOD"] = "getagentlang";
+            sendData["UserID"] = principalID.ToString();
+
+            string uri = String.Concat(m_ServerURI, "/agentprefs");
+            string reqString = ServerUtils.BuildQueryString(sendData);
+
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
+                if (String.IsNullOrEmpty(reply))
+                {
+                    m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: GetLang received null or empty reply");
+                    return "en-us"; // I guess? Gotta return somethin'!
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message);
+            }
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+            if (replyData != null)
+            {
+                if (replyData.ContainsKey("result") &&
+                    (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure"))
+                {
+                    m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: GetLang received Failure response");
+                    return "en-us";
+                }
+                if (replyData.ContainsKey("Language"))
+                    return replyData["Language"].ToString();
+            }
+            else
+            {
+                m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: GetLang received null response");
+
+            }
+            return "en-us";
+        }
+
+        #endregion IAgentPreferencesService
+    }
+}
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 2c1d946..795ca2e 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class AssetServicesConnector : IAssetService
+    public class AssetServicesConnector : BaseServiceConnector, IAssetService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -82,6 +82,7 @@ namespace OpenSim.Services.Connectors
         }
 
         public AssetServicesConnector(IConfigSource source)
+            : base(source, "AssetService")
         {
             Initialise(source);
         }
@@ -221,8 +222,16 @@ namespace OpenSim.Services.Connectors
             
             if (asset == null || asset.Data == null || asset.Data.Length == 0)
             {
-                asset = SynchronousRestObjectRequester.
-                        MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency);
+                // XXX: Commented out for now since this has either never been properly operational or not for some time
+                // as m_maxAssetRequestConcurrency was being passed as the timeout, not a concurrency limiting option.
+                // Wasn't noticed before because timeout wasn't actually used.
+                // Not attempting concurrency setting for now as this omission was discovered in release candidate
+                // phase for OpenSimulator 0.8.  Need to revisit afterwards.
+//                asset
+//                    = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>(
+//                        "GET", uri, 0, m_maxAssetRequestConcurrency);
+
+                asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth);
 
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -252,8 +261,7 @@ namespace OpenSim.Services.Connectors
 
             string uri = MapServer(id) + "/assets/" + id + "/metadata";
 
-            AssetMetadata asset = SynchronousRestObjectRequester.
-                    MakeRequest<int, AssetMetadata>("GET", uri, 0);
+            AssetMetadata asset = SynchronousRestObjectRequester.MakeRequest<int, AssetMetadata>("GET", uri, 0, m_Auth);
             return asset;
         }
 
@@ -267,29 +275,45 @@ namespace OpenSim.Services.Connectors
                     return fullAsset.Data;
             }
 
+<<<<<<< HEAD
+            using (RestClient rc = new RestClient(m_ServerURI))
+            {
+                rc.AddResourcePath("assets");
+                rc.AddResourcePath(id);
+                rc.AddResourcePath("data");
+=======
             RestClient rc = new RestClient(MapServer(id));
             rc.AddResourcePath("assets");
             rc.AddResourcePath(id);
             rc.AddResourcePath("data");
+>>>>>>> avn/ubitvar
 
-            rc.RequestMethod = "GET";
+                rc.RequestMethod = "GET";
 
-            Stream s = rc.Request();
+                Stream s = rc.Request(m_Auth);
 
-            if (s == null)
-                return null;
+                if (s == null)
+                    return null;
 
-            if (s.Length > 0)
-            {
-                byte[] ret = new byte[s.Length];
-                s.Read(ret, 0, (int)s.Length);
+                if (s.Length > 0)
+                {
+                    byte[] ret = new byte[s.Length];
+                    s.Read(ret, 0, (int)s.Length);
 
+<<<<<<< HEAD
+                    return ret;
+                }
+
+                return null;
+            }
+=======
                 s.Close();
                 return ret;
             }
 
             s.Close();
             return null;
+>>>>>>> avn/ubitvar
         }
 
         private class QueuedAssetRequest
@@ -324,12 +348,24 @@ namespace OpenSim.Services.Connectors
                         List<AssetRetrievedEx> handlers;
                         lock (m_AssetHandlers)
                         {
+<<<<<<< HEAD
+                            if (a != null && m_Cache != null)
+                                m_Cache.Cache(a);
+=======
                             handlers = m_AssetHandlers[id];
                             m_AssetHandlers.Remove(id);
                         }
+>>>>>>> avn/ubitvar
 
                         Util.FireAndForget(x =>
                             {
+<<<<<<< HEAD
+                                handlers = m_AssetHandlers[id];
+                                m_AssetHandlers.Remove(id);
+                            }
+                            handlers.Invoke(a);
+                        }, m_maxAssetRequestConcurrency, m_Auth);
+=======
                                 foreach (AssetRetrievedEx h in handlers)
                                 {
                                     // Util.FireAndForget(x =>
@@ -346,6 +382,7 @@ namespace OpenSim.Services.Connectors
 
 //                        if (handlers != null)
 //                            handlers.Clear();
+>>>>>>> avn/ubitvar
                     
                         success = true;
                     }
@@ -413,6 +450,27 @@ namespace OpenSim.Services.Connectors
             return true;
         }
 
+        public virtual bool[] AssetsExist(string[] ids)
+        {
+            string uri = m_ServerURI + "/get_assets_exist";
+
+            bool[] exist = null;
+            try
+            {
+                exist = SynchronousRestObjectRequester.MakeRequest<string[], bool[]>("POST", uri, ids, m_Auth);
+            }
+            catch (Exception)
+            {
+                // This is most likely to happen because the server doesn't support this function,
+                // so just silently return "doesn't exist" for all the assets.
+            }
+            
+            if (exist == null)
+                exist = new bool[ids.Length];
+
+            return exist;
+        }
+
         public string Store(AssetBase asset)
         {
             // Have to assign the asset ID here. This isn't likely to
@@ -449,9 +507,35 @@ namespace OpenSim.Services.Connectors
 
             string uri = MapServer(asset.FullID.ToString()) + "/assets/";
 
-            string newID = string.Empty;
+            string newID;
             try
             {
+<<<<<<< HEAD
+                newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset, m_Auth);
+            }
+            catch (Exception e)
+            {
+                m_log.Warn(string.Format("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1} ", asset.ID, e.Message), e);
+                return string.Empty;
+            }
+
+            // TEMPORARY: SRAS returns 'null' when it's asked to store existing assets
+            if (newID == null)
+            {
+                m_log.DebugFormat("[ASSET CONNECTOR]: Storing of asset {0} returned null; assuming the asset already exists", asset.ID);
+                return asset.ID;
+            }
+
+            if (string.IsNullOrEmpty(newID))
+                return string.Empty;
+
+            asset.ID = newID;
+
+            if (m_Cache != null)
+                m_Cache.Cache(asset);
+
+            return newID;
+=======
                 newID = SynchronousRestObjectRequester.
                         MakeRequest<AssetBase, string>("POST", uri, asset, 25);
                 if (newID == null || newID == "")
@@ -504,6 +588,7 @@ namespace OpenSim.Services.Connectors
                 }
             }
             return asset.ID;
+>>>>>>> avn/ubitvar
         }
 
         public bool UpdateContent(string id, byte[] data)
@@ -526,8 +611,7 @@ namespace OpenSim.Services.Connectors
 
             string uri = MapServer(id) + "/assets/" + id;
 
-            if (SynchronousRestObjectRequester.
-                    MakeRequest<AssetBase, bool>("POST", uri, asset))
+            if (SynchronousRestObjectRequester.MakeRequest<AssetBase, bool>("POST", uri, asset, m_Auth))
             {
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -541,8 +625,7 @@ namespace OpenSim.Services.Connectors
         {
             string uri = MapServer(id) + "/assets/" + id;
 
-            if (SynchronousRestObjectRequester.
-                    MakeRequest<int, bool>("DELETE", uri, 0))
+            if (SynchronousRestObjectRequester.MakeRequest<int, bool>("DELETE", uri, 0, m_Auth))
             {
                 if (m_Cache != null)
                     m_Cache.Expire(id);
diff --git a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
index c395178..3710c86 100644
--- a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors.Hypergrid;
 using OpenSim.Services.Connectors.SimianGrid;
+using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
@@ -83,39 +84,6 @@ namespace OpenSim.Services.Connectors
             }
         }
 
-        private bool StringToUrlAndAssetID(string id, out string url, out string assetID)
-        {
-            url = String.Empty;
-            assetID = String.Empty;
-
-            Uri assetUri;
-
-            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&
-                    assetUri.Scheme == Uri.UriSchemeHttp)
-            {
-                // Simian
-                if (assetUri.Query != string.Empty)
-                {
-                    NameValueCollection qscoll = HttpUtility.ParseQueryString(assetUri.Query);
-                    assetID = qscoll["id"];
-                    if (assetID != null)
-                        url = id.Replace(assetID, ""); // Malformed again, as simian expects
-                    else
-                        url = id; // !!! best effort
-                }
-                else // robust
-                {
-                    url = "http://" + assetUri.Authority;
-                    assetID = assetUri.LocalPath.Trim(new char[] { '/' });
-                }
-
-                return true;
-            }
-
-            m_log.DebugFormat("[HG ASSET SERVICE]: Malformed URL {0}", id);
-            return false;
-        }
-
         private IAssetService GetConnector(string url)
         {
             IAssetService connector = null;
@@ -149,7 +117,7 @@ namespace OpenSim.Services.Connectors
             string url = string.Empty;
             string assetID = string.Empty;
 
-            if (StringToUrlAndAssetID(id, out url, out assetID))
+            if (Util.ParseForeignAssetID(id, out url, out assetID))
             {
                 IAssetService connector = GetConnector(url);
                 return connector.Get(assetID);
@@ -163,7 +131,7 @@ namespace OpenSim.Services.Connectors
             string url = string.Empty;
             string assetID = string.Empty;
 
-            if (StringToUrlAndAssetID(id, out url, out assetID))
+            if (Util.ParseForeignAssetID(id, out url, out assetID))
             {
                 IAssetService connector = GetConnector(url);
                 return connector.GetCached(assetID);
@@ -177,7 +145,7 @@ namespace OpenSim.Services.Connectors
             string url = string.Empty;
             string assetID = string.Empty;
 
-            if (StringToUrlAndAssetID(id, out url, out assetID))
+            if (Util.ParseForeignAssetID(id, out url, out assetID))
             {
                 IAssetService connector = GetConnector(url);
                 return connector.GetMetadata(assetID);
@@ -196,7 +164,7 @@ namespace OpenSim.Services.Connectors
             string url = string.Empty;
             string assetID = string.Empty;
 
-            if (StringToUrlAndAssetID(id, out url, out assetID))
+            if (Util.ParseForeignAssetID(id, out url, out assetID))
             {
                 IAssetService connector = GetConnector(url);
                 return connector.Get(assetID, sender, handler);
@@ -205,12 +173,72 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+
+        private struct AssetAndIndex
+        {
+            public UUID assetID;
+            public int index;
+
+            public AssetAndIndex(UUID assetID, int index)
+            {
+                this.assetID = assetID;
+                this.index = index;
+            }
+        }
+
+        public virtual bool[] AssetsExist(string[] ids)
+        {
+            // This method is a bit complicated because it works even if the assets belong to different
+            // servers; that requires sending separate requests to each server.
+
+            // Group the assets by the server they belong to
+
+            var url2assets = new Dictionary<string, List<AssetAndIndex>>();
+
+            for (int i = 0; i < ids.Length; i++)
+            {
+                string url = string.Empty;
+                string assetID = string.Empty;
+
+                if (Util.ParseForeignAssetID(ids[i], out url, out assetID))
+                {
+                    if (!url2assets.ContainsKey(url))
+                        url2assets.Add(url, new List<AssetAndIndex>());
+                    url2assets[url].Add(new AssetAndIndex(UUID.Parse(assetID), i));
+                }
+            }
+
+            // Query each of the servers in turn
+
+            bool[] exist = new bool[ids.Length];
+
+            foreach (string url in url2assets.Keys)
+            {
+                IAssetService connector = GetConnector(url);
+                lock (EndPointLock(connector))
+                {
+                    List<AssetAndIndex> curAssets = url2assets[url];
+                    string[] assetIDs = curAssets.ConvertAll(a => a.assetID.ToString()).ToArray();
+                    bool[] curExist = connector.AssetsExist(assetIDs);
+
+                    int i = 0;
+                    foreach (AssetAndIndex ai in curAssets)
+                    {
+                        exist[ai.index] = curExist[i];
+                        ++i;
+                    }
+                }
+            }
+
+            return exist;
+        }
+
         public string Store(AssetBase asset)
         {
             string url = string.Empty;
             string assetID = string.Empty;
 
-            if (StringToUrlAndAssetID(asset.ID, out url, out assetID))
+            if (Util.ParseForeignAssetID(asset.ID, out url, out assetID))
             {
                 IAssetService connector = GetConnector(url);
                 // Restore the assetID to a simple UUID
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
index f996aca..0443f5a 100644
--- a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
@@ -32,14 +32,14 @@ using System.IO;
 using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using OpenSim.Server.Base;
 using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class AuthenticationServicesConnector : IAuthenticationService
+    public class AuthenticationServicesConnector : BaseServiceConnector, IAuthenticationService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -57,6 +57,7 @@ namespace OpenSim.Services.Connectors
         }
 
         public AuthenticationServicesConnector(IConfigSource source)
+            : base(source, "AuthenticationService")
         {
             Initialise(source);
         }
@@ -79,6 +80,8 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("Authentication connector init error");
             }
             m_ServerURI = serviceURI;
+
+            base.Initialise(source, "AuthenticationService");
         }
 
         public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
@@ -99,7 +102,7 @@ namespace OpenSim.Services.Connectors
 
             string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                     m_ServerURI + "/auth/plain",
-                    ServerUtils.BuildQueryString(sendData));
+                    ServerUtils.BuildQueryString(sendData), m_Auth);
 
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                     reply);
@@ -112,6 +115,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Verify(UUID principalID, string token, int lifetime)
         {
+//            m_log.Error("[XXX]: Verify");
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["LIFETIME"] = lifetime.ToString();
             sendData["PRINCIPAL"] = principalID.ToString();
@@ -121,7 +125,7 @@ namespace OpenSim.Services.Connectors
 
             string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                     m_ServerURI + "/auth/plain",
-                    ServerUtils.BuildQueryString(sendData));
+                    ServerUtils.BuildQueryString(sendData), m_Auth);
 
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                     reply);
@@ -142,7 +146,7 @@ namespace OpenSim.Services.Connectors
 
             string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                     m_ServerURI + "/auth/plain",
-                    ServerUtils.BuildQueryString(sendData));
+                    ServerUtils.BuildQueryString(sendData), m_Auth);
 
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                     reply);
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
index 35b7109..63730b3 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat("[AUTHORIZATION CONNECTOR]: Unable to send authorize {0} for region {1} error thrown during comms with remote server. Reason: {2}", userID, regionID, e.Message);
-                message = "";
+                message = e.Message;
                 return m_ResponseOnFailure;
             }
             if (response == null)
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
index ddfca57..3f44efa 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
@@ -32,7 +32,7 @@ using System.IO;
 using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using IAvatarService = OpenSim.Services.Interfaces.IAvatarService;
@@ -41,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class AvatarServicesConnector : IAvatarService
+    public class AvatarServicesConnector : BaseServiceConnector, IAvatarService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -59,6 +59,7 @@ namespace OpenSim.Services.Connectors
         }
 
         public AvatarServicesConnector(IConfigSource source)
+            : base(source, "AvatarService")
         {
             Initialise(source);
         }
@@ -81,6 +82,8 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("Avatar connector init error");
             }
             m_ServerURI = serviceURI;
+
+            base.Initialise(source, "AvatarService");
         }
 
 
@@ -114,7 +117,7 @@ namespace OpenSim.Services.Connectors
             // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
             try
             {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                 if (reply == null || (reply != null && reply == string.Empty))
                 {
                     m_log.DebugFormat("[AVATAR CONNECTOR]: GetAgent received null or empty reply");
@@ -162,7 +165,7 @@ namespace OpenSim.Services.Connectors
             //m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
             try
             {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -207,7 +210,7 @@ namespace OpenSim.Services.Connectors
             // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
             try
             {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -250,7 +253,7 @@ namespace OpenSim.Services.Connectors
             // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
             try
             {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -293,7 +296,7 @@ namespace OpenSim.Services.Connectors
             // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
             try
             {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
diff --git a/OpenSim/Services/Connectors/BaseServiceConnector.cs b/OpenSim/Services/Connectors/BaseServiceConnector.cs
new file mode 100644
index 0000000..98cd489
--- /dev/null
+++ b/OpenSim/Services/Connectors/BaseServiceConnector.cs
@@ -0,0 +1,33 @@
+using System;
+using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
+
+using Nini.Config;
+
+namespace OpenSim.Services.Connectors
+{
+    public class BaseServiceConnector
+    {
+        protected IServiceAuth m_Auth;
+
+        public BaseServiceConnector() { }
+
+        public BaseServiceConnector(IConfigSource config, string section)
+        {
+            Initialise(config, section);
+        }
+
+        public void Initialise(IConfigSource config, string section)
+        {
+            string authType = Util.GetConfigVarFromSections<string>(config, "AuthType", new string[] { "Network", section }, "None");
+
+            switch (authType)
+            {
+                case "BasicHttpAuthentication":
+                    m_Auth = new BasicHttpAuthentication(config, section);
+                    break;
+            }
+
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
new file mode 100644
index 0000000..6412bcd
--- /dev/null
+++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+
+using log4net;
+
+using OpenMetaverse;
+using Nini.Config;
+
+using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
+using OpenSim.Services.Connectors;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+
+namespace OpenSim.Services.Connectors
+{
+    public class EstateDataRemoteConnector : BaseServiceConnector, IEstateDataService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+        private ExpiringCache<string, List<EstateSettings>> m_EstateCache = new ExpiringCache<string, List<EstateSettings>>();
+        private const int EXPIRATION = 5 * 60; // 5 minutes in secs
+
+        public EstateDataRemoteConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["EstateService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[ESTATE CONNECTOR]: EstateService missing from OpenSim.ini");
+                throw new Exception("Estate connector init error");
+            }
+
+            string serviceURI = gridConfig.GetString("EstateServerURI",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[ESTATE CONNECTOR]: No Server URI named in section EstateService");
+                throw new Exception("Estate connector init error");
+            }
+            m_ServerURI = serviceURI;
+
+            base.Initialise(source, "EstateService");
+        }
+
+        #region IEstateDataService
+
+        public List<EstateSettings> LoadEstateSettingsAll()
+        {
+            string reply = string.Empty;
+            string uri = m_ServerURI + "/estates";
+
+            reply = MakeRequest("GET", uri, string.Empty);
+            if (String.IsNullOrEmpty(reply))
+                return new List<EstateSettings>();
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            List<EstateSettings> estates = new List<EstateSettings>();
+            if (replyData != null && replyData.Count > 0)
+            {
+                m_log.DebugFormat("[ESTATE CONNECTOR]: LoadEstateSettingsAll returned {0} elements", replyData.Count);
+                Dictionary<string, object>.ValueCollection estateData = replyData.Values;
+                foreach (object r in estateData)
+                {
+                    if (r is Dictionary<string, object>)
+                    {
+                        EstateSettings es = new EstateSettings((Dictionary<string, object>)r);
+                        estates.Add(es);
+                    }
+                }
+                m_EstateCache.AddOrUpdate("estates", estates, EXPIRATION);
+            }
+            else
+                m_log.DebugFormat("[ESTATE CONNECTOR]: LoadEstateSettingsAll from {0} received null or zero response", uri);
+
+            return estates;
+
+        }
+
+        public List<int> GetEstatesAll()
+        {
+            List<int> eids = new List<int>();
+            // If we don't have them, load them from the server
+            List<EstateSettings> estates = null;
+            if (!m_EstateCache.TryGetValue("estates", out estates))
+                LoadEstateSettingsAll();
+
+            foreach (EstateSettings es in estates)
+                eids.Add((int)es.EstateID);
+
+            return eids;
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            // If we don't have them, load them from the server
+            List<EstateSettings> estates = null;
+            if (!m_EstateCache.TryGetValue("estates", out estates))
+                LoadEstateSettingsAll();
+
+            List<int> eids = new List<int>();
+            foreach (EstateSettings es in estates)
+                if (es.EstateName == search)
+                    eids.Add((int)es.EstateID);
+
+            return eids;
+        }
+
+        public List<int> GetEstatesByOwner(UUID ownerID)
+        {
+            // If we don't have them, load them from the server
+            List<EstateSettings> estates = null;
+            if (!m_EstateCache.TryGetValue("estates", out estates))
+                LoadEstateSettingsAll();
+
+            List<int> eids = new List<int>();
+            foreach (EstateSettings es in estates)
+                if (es.EstateOwner == ownerID)
+                    eids.Add((int)es.EstateID);
+
+            return eids;
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            string reply = string.Empty;
+            // /estates/regions/?eid=int
+            string uri = m_ServerURI + "/estates/regions/?eid=" + estateID.ToString();
+
+            reply = MakeRequest("GET", uri, string.Empty);
+            if (String.IsNullOrEmpty(reply))
+                return new List<UUID>();
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            List<UUID> regions = new List<UUID>();
+            if (replyData != null && replyData.Count > 0)
+            {
+                m_log.DebugFormat("[ESTATE CONNECTOR]: GetRegions for estate {0} returned {1} elements", estateID, replyData.Count);
+                Dictionary<string, object>.ValueCollection data = replyData.Values;
+                foreach (object r in data)
+                {
+                    UUID uuid = UUID.Zero;
+                    if (UUID.TryParse(r.ToString(), out uuid))
+                        regions.Add(uuid);
+                }
+            }
+            else
+                m_log.DebugFormat("[ESTATE CONNECTOR]: GetRegions from {0} received null or zero response", uri);
+
+            return regions;
+        }
+
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
+        {
+            string reply = string.Empty;
+            // /estates/estate/?region=uuid&create=[t|f]
+            string uri = m_ServerURI + string.Format("/estates/estate/?region={0}&create={1}", regionID, create);
+
+            reply = MakeRequest("GET", uri, string.Empty);
+            if (String.IsNullOrEmpty(reply))
+                return null;
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            if (replyData != null && replyData.Count > 0)
+            {
+                m_log.DebugFormat("[ESTATE CONNECTOR]: LoadEstateSettings({0}) returned {1} elements", regionID, replyData.Count);
+                EstateSettings es = new EstateSettings(replyData);
+                return es;
+            }
+            else
+                m_log.DebugFormat("[ESTATE CONNECTOR]: LoadEstateSettings(regionID) from {0} received null or zero response", uri);
+
+            return null;
+        }
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            string reply = string.Empty;
+            // /estates/estate/?eid=int
+            string uri = m_ServerURI + string.Format("/estates/estate/?eid={0}", estateID);
+
+            reply = MakeRequest("GET", uri, string.Empty);
+            if (String.IsNullOrEmpty(reply))
+                return null;
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            if (replyData != null && replyData.Count > 0)
+            {
+                m_log.DebugFormat("[ESTATE CONNECTOR]: LoadEstateSettings({0}) returned {1} elements", estateID, replyData.Count);
+                EstateSettings es = new EstateSettings(replyData);
+                return es;
+            }
+            else
+                m_log.DebugFormat("[ESTATE CONNECTOR]: LoadEstateSettings(estateID) from {0} received null or zero response", uri);
+
+            return null;
+        }
+
+        /// <summary>
+        /// Forbidden operation
+        /// </summary>
+        /// <returns></returns>
+        public EstateSettings CreateNewEstate()
+        {
+            // No can do
+            return null;
+        }
+
+        public void StoreEstateSettings(EstateSettings es)
+        {
+            // /estates/estate/
+            string uri = m_ServerURI + ("/estates/estate");
+
+            Dictionary<string, object> formdata = es.ToMap();
+            formdata["OP"] = "STORE";
+
+            PostRequest(uri, formdata);
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            // /estates/estate/?eid=int&region=uuid
+            string uri = m_ServerURI + String.Format("/estates/estate/?eid={0}&region={1}", estateID, regionID);
+
+            Dictionary<string, object> formdata = new Dictionary<string, object>();
+            formdata["OP"] = "LINK";
+            return PostRequest(uri, formdata);
+        }
+
+        private bool PostRequest(string uri, Dictionary<string, object> sendData)
+        {
+            string reqString = ServerUtils.BuildQueryString(sendData);
+
+            string reply = MakeRequest("POST", uri, reqString);
+            if (String.IsNullOrEmpty(reply))
+                return false;
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            bool result = false;
+            if (replyData != null && replyData.Count > 0)
+            {
+                if (replyData.ContainsKey("Result"))
+                {
+                    if (Boolean.TryParse(replyData["Result"].ToString(), out result))
+                        m_log.DebugFormat("[ESTATE CONNECTOR]: PostRequest {0} returned {1}", uri, result);
+                }
+            }
+            else
+                m_log.DebugFormat("[ESTATE CONNECTOR]: PostRequest {0} received null or zero response", uri);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Forbidden operation
+        /// </summary>
+        /// <returns></returns>
+        public bool DeleteEstate(int estateID)
+        {
+            return false;
+        }
+
+        #endregion
+
+        private string MakeRequest(string verb, string uri, string formdata)
+        {
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest(verb, uri, formdata, m_Auth);
+            }
+            catch (WebException e)
+            {
+                using (HttpWebResponse hwr = (HttpWebResponse)e.Response)
+                {
+                    if (hwr != null)
+                    {
+                        if (hwr.StatusCode == HttpStatusCode.NotFound)
+                            m_log.Error(string.Format("[ESTATE CONNECTOR]: Resource {0} not found ", uri));
+                        if (hwr.StatusCode == HttpStatusCode.Unauthorized)
+                            m_log.Error(string.Format("[ESTATE CONNECTOR]: Web request {0} requires authentication ", uri));
+                    }
+                    else
+                        m_log.Error(string.Format(
+                            "[ESTATE CONNECTOR]: WebException for {0} {1} {2} ",
+                            verb, uri, formdata, e));
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[ESTATE CONNECTOR]: Exception when contacting estate server at {0}: {1}", uri, e.Message);
+            }
+
+            return reply;
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index b1dd84e..74851a9 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -32,6 +32,7 @@ using System.IO;
 using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Framework.Communications;
 using OpenSim.Services.Interfaces;
 using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
@@ -40,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors.Friends
 {
-    public class FriendsServicesConnector : IFriendsService
+    public class FriendsServicesConnector : BaseServiceConnector, IFriendsService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -80,6 +81,7 @@ namespace OpenSim.Services.Connectors.Friends
                 throw new Exception("Friends connector init error");
             }
             m_ServerURI = serviceURI;
+            base.Initialise(source, "FriendsService");
         }
 
 
@@ -112,7 +114,7 @@ namespace OpenSim.Services.Connectors.Friends
 
             try
             {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -168,7 +170,7 @@ namespace OpenSim.Services.Connectors.Friends
             string uri = m_ServerURI + "/friends";
             try
             {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);
             }
             catch (Exception e)
             {
@@ -223,7 +225,7 @@ namespace OpenSim.Services.Connectors.Friends
             string uri = m_ServerURI + "/friends";
             try
             {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index af91cdb..d208f1e 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Server.Base;
@@ -40,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class GridServicesConnector : IGridService
+    public class GridServicesConnector : BaseServiceConnector, IGridService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -83,6 +84,8 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("Grid connector init error");
             }
             m_ServerURI = serviceURI;
+
+            base.Initialise(source, "GridService");
         }
 
 
@@ -105,7 +108,7 @@ namespace OpenSim.Services.Connectors
             // m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString);
             try
             {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -161,7 +164,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 string reply
-                    = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                    = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);
 
                 if (reply != string.Empty)
                 {
@@ -198,7 +201,7 @@ namespace OpenSim.Services.Connectors
 
             try
             {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, m_Auth);
             }
             catch (Exception e)
             {
@@ -241,7 +244,7 @@ namespace OpenSim.Services.Connectors
             string uri = m_ServerURI + "/grid";
             try
             {
-                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
+                reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData), m_Auth);
             }
             catch (Exception e)
             {
@@ -293,7 +296,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
             }
             catch (Exception e)
             {
@@ -340,7 +343,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
             }
             catch (Exception e)
             {
@@ -384,7 +387,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
             }
             catch (Exception e)
             {
@@ -438,7 +441,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
 
                 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
             }
@@ -489,7 +492,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
 
                 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
             }
@@ -540,7 +543,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
 
                 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
             }
@@ -593,7 +596,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
 
                 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
             }
@@ -644,7 +647,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
 
                 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
             }
@@ -695,7 +698,7 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), m_Auth);
             }
             catch (Exception e)
             {
@@ -726,6 +729,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/GridUser/GridUserServicesConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
index 1a62d2f..ffdd94a 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Server.Base;
@@ -40,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class GridUserServicesConnector : IGridUserService
+    public class GridUserServicesConnector : BaseServiceConnector, IGridUserService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -80,6 +81,7 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("GridUser connector init error");
             }
             m_ServerURI = serviceURI;
+            base.Initialise(source, "GridUserService");
         }
 
 
@@ -162,7 +164,8 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -198,7 +201,8 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -243,7 +247,8 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply == null || (reply != null && reply == string.Empty))
                 {
                     m_log.DebugFormat("[GRID USER CONNECTOR]: GetGridUserInfo received null or empty reply");
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 803cd1b..2340998 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -202,10 +202,16 @@ namespace OpenSim.Services.Connectors.Hypergrid
             return mapTile;
         }
 
-        public GridRegion GetHyperlinkRegion(GridRegion gatekeeper, UUID regionID)
+        public GridRegion GetHyperlinkRegion(GridRegion gatekeeper, UUID regionID, UUID agentID, string agentHomeURI, out string message)
         {
             Hashtable hash = new Hashtable();
             hash["region_uuid"] = regionID.ToString();
+            if (agentID != UUID.Zero)
+            {
+                hash["agent_id"] = agentID.ToString();
+                if (agentHomeURI != null)
+                    hash["agent_home_uri"] = agentHomeURI;
+            }
 
             IList paramList = new ArrayList();
             paramList.Add(hash);
@@ -219,12 +225,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch (Exception e)
             {
+                message = "Error contacting grid.";
                 m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Exception " + e.Message);
                 return null;
             }
 
             if (response.IsFault)
             {
+                message = "Error contacting grid.";
                 m_log.ErrorFormat("[GATEKEEPER SERVICE CONNECTOR]: remote call returned an error: {0}", response.FaultString);
                 return null;
             }
@@ -236,6 +244,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 bool success = false;
                 Boolean.TryParse((string)hash["result"], out success);
+
+                if (hash["message"] != null)
+                    message = (string)hash["message"];
+                else if (success)
+                    message = null;
+                else
+                    message = "The teleport destination could not be found.";   // probably the dest grid is old and doesn't send 'message', but the most common problem is that the region is unavailable
+
                 if (success)
                 {
                     GridRegion region = new GridRegion();
@@ -255,6 +271,18 @@ namespace OpenSim.Services.Connectors.Hypergrid
                         region.RegionLocY = n;
                         //m_log.Debug(">> HERE, y: " + region.RegionLocY);
                     }
+                    if (hash["size_x"] != null)
+                    {
+                        Int32.TryParse((string)hash["size_x"], out n);
+                        region.RegionSizeX = n;
+                        //m_log.Debug(">> HERE, x: " + region.RegionLocX);
+                    }
+                    if (hash["size_y"] != null)
+                    {
+                        Int32.TryParse((string)hash["size_y"], out n);
+                        region.RegionSizeY = n;
+                        //m_log.Debug(">> HERE, y: " + region.RegionLocY);
+                    }
                     if (hash["region_name"] != null)
                     {
                         region.RegionName = (string)hash["region_name"];
@@ -293,6 +321,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch (Exception e)
             {
+                message = "Error parsing response from grid.";
                 m_log.Error("[GATEKEEPER SERVICE CONNECTOR]: Got exception while parsing hyperlink response " + e.StackTrace);
                 return null;
             }
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index 5004d99..b5e6d69 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
@@ -47,16 +47,22 @@ namespace OpenSim.Services.Connectors
 
         public HeloServicesConnector(string serverURI)
         {
-            if (!serverURI.EndsWith("="))
-                m_ServerURI = serverURI.TrimEnd('/') + "/helo/";
-            else
+            try
             {
-                // Simian sends malformed urls like this:
-                // http://valley.virtualportland.org/simtest/Grid/?id=
-                //
-                try
+                Uri uri;
+
+                if (!serverURI.EndsWith("="))
+                {
+                    // Let's check if this is a valid URI, because it may not be
+                    uri = new Uri(serverURI);
+                    m_ServerURI = serverURI.TrimEnd('/') + "/helo/";
+                }
+                else
                 {
-                    Uri uri = new Uri(serverURI + "xxx");
+                    // Simian sends malformed urls like this:
+                    // http://valley.virtualportland.org/simtest/Grid/?id=
+                    //
+                    uri = new Uri(serverURI + "xxx");
                     if (uri.Query == string.Empty)
                         m_ServerURI = serverURI.TrimEnd('/') + "/helo/";
                     else
@@ -66,21 +72,28 @@ namespace OpenSim.Services.Connectors
                         m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/";
                     }
                 }
-                catch (UriFormatException)
-                {
-                    m_log.WarnFormat("[HELO SERVICE]: Malformed URL {0}", serverURI);
-                }
+
+            }
+            catch (UriFormatException)
+            {
+                m_log.WarnFormat("[HELO SERVICE]: Malformed URL {0}", serverURI);
             }
         }
 
         public virtual string Helo()
         {
-            HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
-            // Eventually we need to switch to HEAD
-            /* req.Method = "HEAD"; */
+            if (String.IsNullOrEmpty(m_ServerURI))
+            {
+                m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to empty URL");
+                return String.Empty;
+            }
 
             try
             {
+                HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
+                // Eventually we need to switch to HEAD
+                /* req.Method = "HEAD"; */
+
                 using (WebResponse response = req.GetResponse())
                 {
                     if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 32ea4ee..10b8d22 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             LogManager.GetLogger(
             MethodBase.GetCurrentMethod().DeclaringType);
 
+        private string m_ServerURLHost;
         private string m_ServerURL;
         private GridRegion m_Gatekeeper;
 
@@ -59,7 +60,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         public UserAgentServiceConnector(string url, bool dnsLookup)
         {
-            m_ServerURL = url;
+            m_ServerURL = m_ServerURLHost = url;
 
             if (dnsLookup)
             {
@@ -75,10 +76,11 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 }
                 catch (Exception e)
                 {
-                    m_log.DebugFormat("[USER AGENT CONNECTOR]: Malformed Uri {0}: {1}", m_ServerURL, e.Message);
+                    m_log.DebugFormat("[USER AGENT CONNECTOR]: Malformed Uri {0}: {1}", url, e.Message);
                 }
             }
-            m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0} ({1})", url, m_ServerURL);
+
+            //m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0} ({1})", url, m_ServerURL);
         }
 
         public UserAgentServiceConnector(IConfigSource config)
@@ -98,9 +100,16 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 m_log.Error("[USER AGENT CONNECTOR]: No Server URI named in section UserAgentService");
                 throw new Exception("UserAgent connector init error");
             }
+<<<<<<< HEAD
+
+            m_ServerURL = m_ServerURLHost = serviceURI;
+            if (!m_ServerURL.EndsWith("/"))
+                m_ServerURL += "/";
+=======
             m_ServerURL = serviceURI;
+>>>>>>> avn/ubitvar
 
-            m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL);
+            //m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0}", m_ServerURL);
         }
 
         protected override string AgentPath()
@@ -111,7 +120,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
         // The Login service calls this interface with fromLogin=true 
         // Sims call it with fromLogin=false
         // Either way, this is verified by the handler
-        public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason)
+        public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason)
         {
             reason = String.Empty;
 
@@ -133,59 +142,62 @@ namespace OpenSim.Services.Connectors.Hypergrid
             Console.WriteLine("   >>> LoginAgentToGrid <<< " + home.ServerURI);
 
             uint flags = fromLogin ? (uint)TeleportFlags.ViaLogin : (uint)TeleportFlags.ViaHome;
-            return CreateAgent(home, aCircuit, flags, out reason);
+            return CreateAgent(source, home, aCircuit, flags, out reason);
         }
 
 
         // The simulators call this interface
-        public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, out string reason)
+        public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, out string reason)
         {
-            return LoginAgentToGrid(aCircuit, gatekeeper, destination, false, out reason);
+            return LoginAgentToGrid(source, aCircuit, gatekeeper, destination, false, out reason);
         }
 
-        protected override void PackData(OSDMap args, AgentCircuitData aCircuit, GridRegion destination, uint flags)
+        protected override void PackData(OSDMap args, GridRegion source, AgentCircuitData aCircuit, GridRegion destination, uint flags)
         {
-            base.PackData(args, aCircuit, destination, flags);
+            base.PackData(args, source, aCircuit, destination, flags);
             args["gatekeeper_serveruri"] = OSD.FromString(m_Gatekeeper.ServerURI);
             args["gatekeeper_host"] = OSD.FromString(m_Gatekeeper.ExternalHostName);
             args["gatekeeper_port"] = OSD.FromString(m_Gatekeeper.HttpPort.ToString());
             args["destination_serveruri"] = OSD.FromString(destination.ServerURI);
         }
 
-        protected OSDMap PackCreateAgentArguments(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, IPEndPoint ipaddress)
+        public void SetClientToken(UUID sessionID, string token)
+        { 
+            // no-op
+        }
+
+        private Hashtable CallServer(string methodName, Hashtable hash)
         {
-            OSDMap args = null;
+            IList paramList = new ArrayList();
+            paramList.Add(hash);
+
+            XmlRpcRequest request = new XmlRpcRequest(methodName, paramList);
+
+            // Send and get reply
+            XmlRpcResponse response = null;
             try
             {
-                args = aCircuit.PackAgentCircuitData();
+                response = request.Send(m_ServerURL, 10000);
             }
             catch (Exception e)
             {
-                m_log.Debug("[USER AGENT CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message);
+                m_log.DebugFormat("[USER AGENT CONNECTOR]: {0} call to {1} failed: {2}", methodName, m_ServerURLHost, e.Message);
+                throw;
             }
 
-            // Add the input arguments
-            args["gatekeeper_serveruri"] = OSD.FromString(gatekeeper.ServerURI);
-            args["gatekeeper_host"] = OSD.FromString(gatekeeper.ExternalHostName);
-            args["gatekeeper_port"] = OSD.FromString(gatekeeper.HttpPort.ToString());
-            args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
-            args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
-            args["destination_name"] = OSD.FromString(destination.RegionName);
-            args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
-            args["destination_serveruri"] = OSD.FromString(destination.ServerURI);
+            if (response.IsFault)
+            {
+                throw new Exception(string.Format("[USER AGENT CONNECTOR]: {0} call to {1} returned an error: {2}", methodName, m_ServerURLHost, response.FaultString));
+            }
 
-            // 10/3/2010
-            // I added the client_ip up to the regular AgentCircuitData, so this doesn't need to be here.
-            // This need cleaning elsewhere...
-            //if (ipaddress != null)
-            //    args["client_ip"] = OSD.FromString(ipaddress.Address.ToString());
+            hash = (Hashtable)response.Value;
 
-            return args;
-        }
+            if (hash == null)
+            {
+                throw new Exception(string.Format("[USER AGENT CONNECTOR]: {0} call to {1} returned null", methodName, m_ServerURLHost));
+            }
 
-        public void SetClientToken(UUID sessionID, string token)
-        { 
-            // no-op
+            return hash;
         }
 
         public GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt)
@@ -195,89 +207,70 @@ namespace OpenSim.Services.Connectors.Hypergrid
             Hashtable hash = new Hashtable();
             hash["userID"] = userID.ToString();
 
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
+            hash = CallServer("get_home_region", hash);
 
-            XmlRpcRequest request = new XmlRpcRequest("get_home_region", paramList);
-            XmlRpcResponse response = null;
-            try
+            bool success;
+            if (!Boolean.TryParse((string)hash["result"], out success) || !success)
+                return null;
+
+            GridRegion region = new GridRegion();
+
+            UUID.TryParse((string)hash["uuid"], out region.RegionID);
+            //m_log.Debug(">> HERE, uuid: " + region.RegionID);
+            int n = 0;
+            if (hash["x"] != null)
             {
-                response = request.Send(m_ServerURL, 10000);
+                Int32.TryParse((string)hash["x"], out n);
+                region.RegionLocX = n;
+                //m_log.Debug(">> HERE, x: " + region.RegionLocX);
             }
-            catch (Exception)
+            if (hash["y"] != null)
             {
-                return null;
+                Int32.TryParse((string)hash["y"], out n);
+                region.RegionLocY = n;
+                //m_log.Debug(">> HERE, y: " + region.RegionLocY);
             }
-
-            if (response.IsFault)
+            if (hash["size_x"] != null)
             {
-                return null;
+                Int32.TryParse((string)hash["size_x"], out n);
+                region.RegionSizeX = n;
+                //m_log.Debug(">> HERE, x: " + region.RegionLocX);
             }
-
-            hash = (Hashtable)response.Value;
-            //foreach (Object o in hash)
-            //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
-            try
+            if (hash["size_y"] != null)
             {
-                bool success = false;
-                Boolean.TryParse((string)hash["result"], out success);
-                if (success)
-                {
-                    GridRegion region = new GridRegion();
-
-                    UUID.TryParse((string)hash["uuid"], out region.RegionID);
-                    //m_log.Debug(">> HERE, uuid: " + region.RegionID);
-                    int n = 0;
-                    if (hash["x"] != null)
-                    {
-                        Int32.TryParse((string)hash["x"], out n);
-                        region.RegionLocX = n;
-                        //m_log.Debug(">> HERE, x: " + region.RegionLocX);
-                    }
-                    if (hash["y"] != null)
-                    {
-                        Int32.TryParse((string)hash["y"], out n);
-                        region.RegionLocY = n;
-                        //m_log.Debug(">> HERE, y: " + region.RegionLocY);
-                    }
-                    if (hash["region_name"] != null)
-                    {
-                        region.RegionName = (string)hash["region_name"];
-                        //m_log.Debug(">> HERE, name: " + region.RegionName);
-                    }
-                    if (hash["hostname"] != null)
-                        region.ExternalHostName = (string)hash["hostname"];
-                    if (hash["http_port"] != null)
-                    {
-                        uint p = 0;
-                        UInt32.TryParse((string)hash["http_port"], out p);
-                        region.HttpPort = p;
-                    }
-                    if (hash.ContainsKey("server_uri") && hash["server_uri"] != null)
-                        region.ServerURI = (string)hash["server_uri"];
-
-                    if (hash["internal_port"] != null)
-                    {
-                        int p = 0;
-                        Int32.TryParse((string)hash["internal_port"], out p);
-                        region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p);
-                    }
-                    if (hash["position"] != null)
-                        Vector3.TryParse((string)hash["position"], out position);
-                    if (hash["lookAt"] != null)
-                        Vector3.TryParse((string)hash["lookAt"], out lookAt);
-
-                    // Successful return
-                    return region;
-                }
-
+                Int32.TryParse((string)hash["size_y"], out n);
+                region.RegionSizeY = n;
+                //m_log.Debug(">> HERE, y: " + region.RegionLocY);
             }
-            catch (Exception)
+            if (hash["region_name"] != null)
             {
-                return null;
+                region.RegionName = (string)hash["region_name"];
+                //m_log.Debug(">> HERE, name: " + region.RegionName);
+            }
+            if (hash["hostname"] != null)
+                region.ExternalHostName = (string)hash["hostname"];
+            if (hash["http_port"] != null)
+            {
+                uint p = 0;
+                UInt32.TryParse((string)hash["http_port"], out p);
+                region.HttpPort = p;
             }
+            if (hash.ContainsKey("server_uri") && hash["server_uri"] != null)
+                region.ServerURI = (string)hash["server_uri"];
 
-            return null;
+            if (hash["internal_port"] != null)
+            {
+                int p = 0;
+                Int32.TryParse((string)hash["internal_port"], out p);
+                region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p);
+            }
+            if (hash["position"] != null)
+                Vector3.TryParse((string)hash["position"], out position);
+            if (hash["lookAt"] != null)
+                Vector3.TryParse((string)hash["lookAt"], out lookAt);
+
+            // Successful return
+            return region;
         }
 
         public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName)
@@ -364,14 +357,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch
             {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for StatusNotification", m_ServerURL);
+                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for StatusNotification", m_ServerURLHost);
 //                reason = "Exception: " + e.Message;
                 return friendsOnline;
             }
 
             if (response.IsFault)
             {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for StatusNotification returned an error: {1}", m_ServerURL, response.FaultString);
+                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for StatusNotification returned an error: {1}", m_ServerURLHost, response.FaultString);
 //                reason = "XMLRPC Fault";
                 return friendsOnline;
             }
@@ -383,7 +376,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 if (hash == null)
                 {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
+                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURLHost);
 //                    reason = "Internal error 1";
                     return friendsOnline;
                 }
@@ -436,14 +429,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch
             {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetOnlineFriends", m_ServerURL);
+                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetOnlineFriends", m_ServerURLHost);
 //                reason = "Exception: " + e.Message;
                 return online;
             }
 
             if (response.IsFault)
             {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetOnlineFriends returned an error: {1}", m_ServerURL, response.FaultString);
+                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetOnlineFriends returned an error: {1}", m_ServerURLHost, response.FaultString);
 //                reason = "XMLRPC Fault";
                 return online;
             }
@@ -455,7 +448,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 if (hash == null)
                 {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
+                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURLHost);
 //                    reason = "Internal error 1";
                     return online;
                 }
@@ -486,50 +479,16 @@ namespace OpenSim.Services.Connectors.Hypergrid
             Hashtable hash = new Hashtable();
             hash["userID"] = userID.ToString();
 
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-
-            XmlRpcRequest request = new XmlRpcRequest("get_user_info", paramList);
+            hash = CallServer("get_user_info", hash);
 
             Dictionary<string, object> info = new Dictionary<string, object>();
-            XmlRpcResponse response = null;
-            try
-            {
-                response = request.Send(m_ServerURL, 10000);
-            }
-            catch
-            {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetUserInfo", m_ServerURL);
-                return info;
-            }
-
-            if (response.IsFault)
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetServerURLs returned an error: {1}", m_ServerURL, response.FaultString);
-                return info;
-            }
 
-            hash = (Hashtable)response.Value;
-            try
+            foreach (object key in hash.Keys)
             {
-                if (hash == null)
+                if (hash[key] != null)
                 {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetUserInfo Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
-                    return info;
+                    info.Add(key.ToString(), hash[key]);
                 }
-
-                // Here is the actual response
-                foreach (object key in hash.Keys)
-                {
-                    if (hash[key] != null)
-                    {
-                        info.Add(key.ToString(), hash[key]);
-                    }
-                }
-            }
-            catch
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response.");
             }
 
             return info;
@@ -540,60 +499,16 @@ namespace OpenSim.Services.Connectors.Hypergrid
             Hashtable hash = new Hashtable();
             hash["userID"] = userID.ToString();
 
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-
-            XmlRpcRequest request = new XmlRpcRequest("get_server_urls", paramList);
-//            string reason = string.Empty;
-
-            // Send and get reply
-            Dictionary<string, object> serverURLs = new Dictionary<string,object>();
-            XmlRpcResponse response = null;
-            try
-            {
-                response = request.Send(m_ServerURL, 10000);
-            }
-            catch
-            {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetServerURLs for user {1}", m_ServerURL, userID);
-//                reason = "Exception: " + e.Message;
-                return serverURLs;
-            }
-
-            if (response.IsFault)
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetServerURLs returned an error: {1}", m_ServerURL, response.FaultString);
-//                reason = "XMLRPC Fault";
-                return serverURLs;
-            }
-
-            hash = (Hashtable)response.Value;
-            //foreach (Object o in hash)
-            //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
-            try
+            hash = CallServer("get_server_urls", hash);
+           
+            Dictionary<string, object> serverURLs = new Dictionary<string, object>();
+            foreach (object key in hash.Keys)
             {
-                if (hash == null)
+                if (key is string && ((string)key).StartsWith("SRV_") && hash[key] != null)
                 {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetServerURLs Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
-//                    reason = "Internal error 1";
-                    return serverURLs;
+                    string serverType = key.ToString().Substring(4); // remove "SRV_"
+                    serverURLs.Add(serverType, hash[key].ToString());
                 }
-
-                // Here is the actual response
-                foreach (object key in hash.Keys)
-                {
-                    if (key is string && ((string)key).StartsWith("SRV_") && hash[key] != null)
-                    {
-                        string serverType = key.ToString().Substring(4); // remove "SRV_"
-                        serverURLs.Add(serverType, hash[key].ToString());
-                    }
-                }
-
-            }
-            catch
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response.");
-//                reason = "Exception: " + e.Message;
             }
 
             return serverURLs;
@@ -604,55 +519,13 @@ namespace OpenSim.Services.Connectors.Hypergrid
             Hashtable hash = new Hashtable();
             hash["userID"] = userID.ToString();
 
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-
-            XmlRpcRequest request = new XmlRpcRequest("locate_user", paramList);
-//            string reason = string.Empty;
+            hash = CallServer("locate_user", hash);           
 
-            // Send and get reply
             string url = string.Empty;
-            XmlRpcResponse response = null;
-            try
-            {
-                response = request.Send(m_ServerURL, 10000);
-            }
-            catch
-            {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for LocateUser", m_ServerURL);
-//                reason = "Exception: " + e.Message;
-                return url;
-            }
 
-            if (response.IsFault)
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for LocateUser returned an error: {1}", m_ServerURL, response.FaultString);
-//                reason = "XMLRPC Fault";
-                return url;
-            }
-
-            hash = (Hashtable)response.Value;
-            //foreach (Object o in hash)
-            //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
-            try
-            {
-                if (hash == null)
-                {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: LocateUser Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
-//                    reason = "Internal error 1";
-                    return url;
-                }
-
-                // Here's the actual response
-                if (hash.ContainsKey("URL"))
-                    url = hash["URL"].ToString();
-
-            }
-            catch
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on LocateUser response.");
-//                reason = "Exception: " + e.Message;
-            }
+            // Here's the actual response
+            if (hash.ContainsKey("URL"))
+                url = hash["URL"].ToString();
 
             return url;
         }
@@ -663,55 +536,13 @@ namespace OpenSim.Services.Connectors.Hypergrid
             hash["userID"] = userID.ToString();
             hash["targetUserID"] = targetUserID.ToString();
 
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-
-            XmlRpcRequest request = new XmlRpcRequest("get_uui", paramList);
-//            string reason = string.Empty;
+            hash = CallServer("get_uui", hash);
 
-            // Send and get reply
             string uui = string.Empty;
-            XmlRpcResponse response = null;
-            try
-            {
-                response = request.Send(m_ServerURL, 10000);
-            }
-            catch
-            {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetUUI", m_ServerURL);
-//                reason = "Exception: " + e.Message;
-                return uui;
-            }
 
-            if (response.IsFault)
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetUUI returned an error: {1}", m_ServerURL, response.FaultString);
-//                reason = "XMLRPC Fault";
-                return uui;
-            }
-
-            hash = (Hashtable)response.Value;
-            //foreach (Object o in hash)
-            //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
-            try
-            {
-                if (hash == null)
-                {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetUUI Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
-//                    reason = "Internal error 1";
-                    return uui;
-                }
-
-                // Here's the actual response
-                if (hash.ContainsKey("UUI"))
-                    uui = hash["UUI"].ToString();
-
-            }
-            catch
-            {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetUUI response.");
-//                reason = "Exception: " + e.Message;
-            }
+            // Here's the actual response
+            if (hash.ContainsKey("UUI"))
+                uui = hash["UUI"].ToString();
 
             return uui;
         }
@@ -722,54 +553,17 @@ namespace OpenSim.Services.Connectors.Hypergrid
             hash["first"] = first;
             hash["last"] = last;
 
-            IList paramList = new ArrayList();
-            paramList.Add(hash);
-
-            XmlRpcRequest request = new XmlRpcRequest("get_uuid", paramList);
-            //            string reason = string.Empty;
-
-            // Send and get reply
-            UUID uuid = UUID.Zero;
-            XmlRpcResponse response = null;
-            try
-            {
-                response = request.Send(m_ServerURL, 10000);
-            }
-            catch
-            {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetUUID", m_ServerURL);
-                //                reason = "Exception: " + e.Message;
-                return uuid;
-            }
+            hash = CallServer("get_uuid", hash);
 
-            if (response.IsFault)
+            if (!hash.ContainsKey("UUID"))
             {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetUUID returned an error: {1}", m_ServerURL, response.FaultString);
-                //                reason = "XMLRPC Fault";
-                return uuid;
+                throw new Exception(string.Format("[USER AGENT CONNECTOR]: get_uuid call to {0} didn't return a UUID", m_ServerURLHost));
             }
 
-            hash = (Hashtable)response.Value;
-            //foreach (Object o in hash)
-            //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
-            try
-            {
-                if (hash == null)
-                {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetUUDI Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
-                    //                    reason = "Internal error 1";
-                    return uuid;
-                }
-
-                // Here's the actual response
-                if (hash.ContainsKey("UUID"))
-                    UUID.TryParse(hash["UUID"].ToString(), out uuid);
-
-            }
-            catch
+            UUID uuid;
+            if (!UUID.TryParse(hash["UUID"].ToString(), out uuid))
             {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on UUID response.");
-                //                reason = "Exception: " + e.Message;
+                throw new Exception(string.Format("[USER AGENT CONNECTOR]: get_uuid call to {0} returned an invalid UUID: {1}", m_ServerURLHost, hash["UUID"].ToString()));
             }
 
             return uuid;
@@ -777,7 +571,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         private bool GetBoolResponse(XmlRpcRequest request, out string reason)
         {
-            //m_log.Debug("[USER AGENT CONNECTOR]: GetBoolResponse from/to " + m_ServerURL);
+            //m_log.Debug("[USER AGENT CONNECTOR]: GetBoolResponse from/to " + m_ServerURLHost);
             XmlRpcResponse response = null;
             try
             {
@@ -785,14 +579,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetBoolResponse", m_ServerURL);
+                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetBoolResponse", m_ServerURLHost);
                 reason = "Exception: " + e.Message;
                 return false;
             }
 
             if (response.IsFault)
             {
-                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetBoolResponse returned an error: {1}", m_ServerURL, response.FaultString);
+                m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetBoolResponse returned an error: {1}", m_ServerURLHost, response.FaultString);
                 reason = "XMLRPC Fault";
                 return false;
             }
@@ -804,7 +598,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 if (hash == null)
                 {
-                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
+                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got null response from {0}! THIS IS BAAAAD", m_ServerURLHost);
                     reason = "Internal error 1";
                     return false;
                 }
@@ -815,7 +609,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 else
                 {
                     reason = "Internal error 2";
-                    m_log.WarnFormat("[USER AGENT CONNECTOR]: response from {0} does not have expected key 'result'", m_ServerURL);
+                    m_log.WarnFormat("[USER AGENT CONNECTOR]: response from {0} does not have expected key 'result'", m_ServerURLHost);
                 }
 
                 return success;
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index 36d4ae2..b0615b8 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -34,21 +34,36 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Services.Interfaces;
 using OpenSim.Server.Base;
 using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class XInventoryServicesConnector : IInventoryService
+    public class XInventoryServicesConnector : BaseServiceConnector, IInventoryService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Number of requests made to the remote inventory service.
+        /// </summary>
+        public int RequestsMade { get; private set; }
+
         private string m_ServerURI = String.Empty;
 
-        private object m_Lock = new object();
+        /// <summary>
+        /// Timeout for remote requests.
+        /// </summary>
+        /// <remarks>
+        /// In this case, -1 is default timeout (100 seconds), not infinite.
+        /// </remarks>
+        private int m_requestTimeoutSecs = -1;
+
+        private const double CACHE_EXPIRATION_SECONDS = 20.0;
+        private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>();
 
         public XInventoryServicesConnector()
         {
@@ -60,20 +75,21 @@ namespace OpenSim.Services.Connectors
         }
 
         public XInventoryServicesConnector(IConfigSource source)
+            : base(source, "InventoryService")
         {
             Initialise(source);
         }
 
         public virtual void Initialise(IConfigSource source)
         {
-            IConfig assetConfig = source.Configs["InventoryService"];
-            if (assetConfig == null)
+            IConfig config = source.Configs["InventoryService"];
+            if (config == null)
             {
                 m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
                 throw new Exception("Inventory connector init error");
             }
 
-            string serviceURI = assetConfig.GetString("InventoryServerURI",
+            string serviceURI = config.GetString("InventoryServerURI",
                     String.Empty);
 
             if (serviceURI == String.Empty)
@@ -82,6 +98,21 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("Inventory connector init error");
             }
             m_ServerURI = serviceURI;
+
+            m_requestTimeoutSecs = config.GetInt("RemoteRequestTimeout", m_requestTimeoutSecs);
+
+            StatsManager.RegisterStat(
+                new Stat(
+                "RequestsMade", 
+                "Requests made", 
+                "Number of requests made to the remove inventory service", 
+                "requests", 
+                "inventory", 
+                serviceURI, 
+                StatType.Pull, 
+                MeasuresOfInterest.AverageChangeOverTime,
+                s => s.Value = RequestsMade,
+                StatVerbosity.Debug));
         }
 
         private bool CheckReturn(Dictionary<string, object> ret)
@@ -158,7 +189,7 @@ namespace OpenSim.Services.Connectors
             return BuildFolder((Dictionary<string, object>)ret["folder"]);
         }
 
-        public InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
+        public InventoryFolderBase GetFolderForType(UUID principalID, FolderType type)
         {
             Dictionary<string,object> ret = MakeRequest("GETFOLDERFORTYPE",
                     new Dictionary<string,object> {
@@ -177,7 +208,7 @@ namespace OpenSim.Services.Connectors
             InventoryCollection inventory = new InventoryCollection();
             inventory.Folders = new List<InventoryFolderBase>();
             inventory.Items = new List<InventoryItemBase>();
-            inventory.UserID = principalID;
+            inventory.OwnerID = principalID;
 
             try
             {
@@ -190,15 +221,17 @@ namespace OpenSim.Services.Connectors
                 if (!CheckReturn(ret))
                     return null;
 
-                Dictionary<string,object> folders =
-                        (Dictionary<string,object>)ret["FOLDERS"];
-                Dictionary<string,object> items =
-                        (Dictionary<string,object>)ret["ITEMS"];
-
-                foreach (Object o in folders.Values) // getting the values directly, we don't care about the keys folder_i
-                    inventory.Folders.Add(BuildFolder((Dictionary<string, object>)o));
-                foreach (Object o in items.Values) // getting the values directly, we don't care about the keys item_i
-                    inventory.Items.Add(BuildItem((Dictionary<string, object>)o));
+                Dictionary<string,object> folders = ret.ContainsKey("FOLDERS") ?
+                    (Dictionary<string,object>)ret["FOLDERS"] : null;
+                Dictionary<string,object> items = ret.ContainsKey("ITEMS") ?
+                    (Dictionary<string, object>)ret["ITEMS"] : null;
+
+                if (folders != null)
+                    foreach (Object o in folders.Values) // getting the values directly, we don't care about the keys folder_i
+                        inventory.Folders.Add(BuildFolder((Dictionary<string, object>)o));
+                if (items != null)
+                    foreach (Object o in items.Values) // getting the values directly, we don't care about the keys item_i
+                        inventory.Items.Add(BuildItem((Dictionary<string, object>)o));
             }
             catch (Exception e)
             {
@@ -207,6 +240,87 @@ namespace OpenSim.Services.Connectors
 
             return inventory;
         }
+        
+        public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
+        {
+            InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length];
+            // m_log.DebugFormat("[XXX]: In GetMultipleFoldersContent {0}", String.Join(",", folderIDs));
+            try
+            {
+                Dictionary<string, object> resultSet = MakeRequest("GETMULTIPLEFOLDERSCONTENT",
+                        new Dictionary<string, object> {
+                            { "PRINCIPAL", principalID.ToString() },
+                            { "FOLDERS", String.Join(",", folderIDs) },
+                            { "COUNT", folderIDs.Length.ToString() }
+                        });
+
+                if (!CheckReturn(resultSet))
+                    return null;
+
+                int i = 0;
+                foreach (KeyValuePair<string, object> kvp in resultSet)
+                {
+                    InventoryCollection inventory = new InventoryCollection();
+                    if (kvp.Key.StartsWith("F_"))
+                    {
+                        UUID fid = UUID.Zero;
+                        if (UUID.TryParse(kvp.Key.Substring(2), out fid) && fid == folderIDs[i])
+                        {
+                            inventory.Folders = new List<InventoryFolderBase>();
+                            inventory.Items = new List<InventoryItemBase>();
+
+                            Dictionary<string, object> ret = (Dictionary<string, object>)kvp.Value;
+
+                            if (ret.ContainsKey("FID"))
+                            {
+                                if (!UUID.TryParse(ret["FID"].ToString(), out inventory.FolderID))
+                                    m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: Could not parse folder id {0}", ret["FID"].ToString());
+                            }
+                            else
+                                m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: FID key not present in response");
+
+                            inventory.Version = -1;
+                            if (ret.ContainsKey("VERSION"))
+                                Int32.TryParse(ret["VERSION"].ToString(), out inventory.Version);
+                            if (ret.ContainsKey("OWNER"))
+                                UUID.TryParse(ret["OWNER"].ToString(), out inventory.OwnerID);
+
+                            //m_log.DebugFormat("[XXX]: Received {0} ({1}) {2} {3}", inventory.FolderID, fid, inventory.Version, inventory.OwnerID);
+
+                            Dictionary<string, object> folders =
+                                    (Dictionary<string, object>)ret["FOLDERS"];
+                            Dictionary<string, object> items =
+                                    (Dictionary<string, object>)ret["ITEMS"];
+
+                            foreach (Object o in folders.Values) // getting the values directly, we don't care about the keys folder_i
+                            {
+                                inventory.Folders.Add(BuildFolder((Dictionary<string, object>)o));
+                            }
+                            foreach (Object o in items.Values) // getting the values directly, we don't care about the keys item_i
+                            {
+                                inventory.Items.Add(BuildItem((Dictionary<string, object>)o));
+                            }
+
+                            inventoryArr[i] = inventory;
+                        }
+                        else
+                        {
+                            m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: Folder id does not match. Expected {0} got {1}",
+                                folderIDs[i], fid);
+                            m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: {0} {1}", String.Join(",", folderIDs), String.Join(",", resultSet.Keys));
+                        }
+
+                        i += 1;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: Exception in GetMultipleFoldersContent: {0}", e.Message);
+            }
+
+            return inventoryArr;
+        }
 
         public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
         {
@@ -297,9 +411,13 @@ namespace OpenSim.Services.Connectors
 
         public bool AddItem(InventoryItemBase item)
         {
+            if (item.Description == null)
+                item.Description = String.Empty;
             if (item.CreatorData == null)
                 item.CreatorData = String.Empty;
-            Dictionary<string,object> ret = MakeRequest("ADDITEM",
+            if (item.CreatorId == null)
+                item.CreatorId = String.Empty;
+            Dictionary<string, object> ret = MakeRequest("ADDITEM",
                     new Dictionary<string,object> {
                         { "AssetID", item.AssetID.ToString() },
                         { "AssetType", item.AssetType.ToString() },
@@ -398,6 +516,10 @@ namespace OpenSim.Services.Connectors
 
         public InventoryItemBase GetItem(InventoryItemBase item)
         {
+            InventoryItemBase retrieved = null;
+            if (m_ItemCache.TryGetValue(item.ID, out retrieved))
+                return retrieved;
+
             try
             {
                 Dictionary<string, object> ret = MakeRequest("GETITEM",
@@ -408,14 +530,78 @@ namespace OpenSim.Services.Connectors
                 if (!CheckReturn(ret))
                     return null;
 
-                return BuildItem((Dictionary<string, object>)ret["item"]);
+                retrieved = BuildItem((Dictionary<string, object>)ret["item"]);
             }
             catch (Exception e)
             {
                 m_log.Error("[XINVENTORY SERVICES CONNECTOR]: Exception in GetItem: ", e);
             }
 
-            return null;
+            m_ItemCache.AddOrUpdate(item.ID, retrieved, CACHE_EXPIRATION_SECONDS);
+
+            return retrieved;
+        }
+
+        public virtual InventoryItemBase[] GetMultipleItems(UUID principalID, UUID[] itemIDs)
+        {
+            //m_log.DebugFormat("[XXX]: In GetMultipleItems {0}", String.Join(",", itemIDs));
+
+            InventoryItemBase[] itemArr = new InventoryItemBase[itemIDs.Length];
+            // Try to get them from the cache
+            List<UUID> pending = new List<UUID>();
+            InventoryItemBase item = null;
+            int i = 0;
+            foreach (UUID id in itemIDs)
+            {
+                if (m_ItemCache.TryGetValue(id, out item))
+                    itemArr[i++] = item;
+                else
+                    pending.Add(id);
+            }
+
+            if (pending.Count == 0) // we're done, everything was in the cache
+                return itemArr;
+
+            try
+            {
+                Dictionary<string, object> resultSet = MakeRequest("GETMULTIPLEITEMS",
+                        new Dictionary<string, object> {
+                            { "PRINCIPAL", principalID.ToString() },
+                            { "ITEMS", String.Join(",", pending.ToArray()) },
+                            { "COUNT", pending.Count.ToString() }
+                        });
+
+                if (!CheckReturn(resultSet))
+                {
+                    if (i == 0)
+                        return null;
+                    else
+                        return itemArr;
+                }
+
+                // carry over index i where we left above
+                foreach (KeyValuePair<string, object> kvp in resultSet)
+                {
+                    InventoryCollection inventory = new InventoryCollection();
+                    if (kvp.Key.StartsWith("item_"))
+                    {
+                        if (kvp.Value is Dictionary<string, object>)
+                        {
+                            item = BuildItem((Dictionary<string, object>)kvp.Value);
+                            m_ItemCache.AddOrUpdate(item.ID, item, CACHE_EXPIRATION_SECONDS);
+                            itemArr[i++] = item;
+                        }
+                        else
+                            itemArr[i++] = null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: Exception in GetMultipleItems: {0}", e.Message);
+            }
+
+            return itemArr;
         }
 
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
@@ -484,45 +670,6 @@ namespace OpenSim.Services.Connectors
             return 0;
         }
 
-        public InventoryCollection GetUserInventory(UUID principalID)
-        {
-            InventoryCollection inventory = new InventoryCollection();
-            inventory.Folders = new List<InventoryFolderBase>();
-            inventory.Items = new List<InventoryItemBase>();
-            inventory.UserID = principalID;
-
-            try
-            {
-                Dictionary<string, object> ret = MakeRequest("GETUSERINVENTORY",
-                        new Dictionary<string, object> {
-                            { "PRINCIPAL", principalID.ToString() }
-                        });
-
-                if (!CheckReturn(ret))
-                    return null;
-
-                Dictionary<string, object> folders =
-                        (Dictionary<string, object>)ret["FOLDERS"];
-                Dictionary<string, object> items =
-                        (Dictionary<string, object>)ret["ITEMS"];
-
-                foreach (Object o in folders.Values) // getting the values directly, we don't care about the keys folder_i
-                    inventory.Folders.Add(BuildFolder((Dictionary<string, object>)o));
-                foreach (Object o in items.Values) // getting the values directly, we don't care about the keys item_i
-                    inventory.Items.Add(BuildItem((Dictionary<string, object>)o));
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[XINVENTORY SERVICES CONNECTOR]: Exception in GetUserInventory: ", e);
-            }
-
-            return inventory;
-        }
-
-        public void GetUserInventory(UUID principalID, InventoryReceiptCallback callback)
-        {
-        }
-
         public bool HasInventoryForUser(UUID principalID)
         {
             return false;
@@ -533,13 +680,19 @@ namespace OpenSim.Services.Connectors
         private Dictionary<string,object> MakeRequest(string method,
                 Dictionary<string,object> sendData)
         {
-            sendData["METHOD"] = method;
+            // Add "METHOD" as the first key in the dictionary. This ensures that it will be
+            // visible even when using partial logging ("debug http all 5").
+            Dictionary<string, object> temp = sendData;
+            sendData = new Dictionary<string,object>{ { "METHOD", method } };
+            foreach (KeyValuePair<string, object> kvp in temp)
+                sendData.Add(kvp.Key, kvp.Value);
+
+            RequestsMade++;
 
-            string reply = string.Empty;
-            lock (m_Lock)
-                reply = SynchronousRestFormsRequester.MakeRequest("POST",
-                         m_ServerURI + "/xinventory",
-                         ServerUtils.BuildQueryString(sendData));
+            string reply 
+                = SynchronousRestFormsRequester.MakeRequest(
+                    "POST", m_ServerURI + "/xinventory",
+                     ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth);
 
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
                     reply);
@@ -607,4 +760,4 @@ namespace OpenSim.Services.Connectors
             return item;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
index 833e22a..3408f7a 100644
--- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 uint xpos = 0, ypos = 0;
-                Utils.LongToUInts(regionHandle, out xpos, out ypos);
+                Util.RegionHandleToWorldLoc(regionHandle, out xpos, out ypos);
                 GridRegion info = m_GridService.GetRegionByPosition(scopeID, (int)xpos, (int)ypos);
                 if (info != null) // just to be sure
                 {
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
index ba4c3c5..a0ac5f9 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
@@ -36,6 +36,7 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;
@@ -43,7 +44,7 @@ using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Services.Connectors
 {
-    public class MapImageServicesConnector : IMapImageService
+    public class MapImageServicesConnector : BaseServiceConnector, IMapImageService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -84,6 +85,68 @@ namespace OpenSim.Services.Connectors
             }
             m_ServerURI = serviceURI;
             m_ServerURI = serviceURI.TrimEnd('/');
+            base.Initialise(source, "MapImageService");
+        }
+
+        public bool RemoveMapTile(int x, int y, out string reason)
+        {
+            reason = string.Empty;
+            int tickstart = Util.EnvironmentTickCount();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["X"] = x.ToString();
+            sendData["Y"] = y.ToString();
+
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            string uri = m_ServerURI + "/removemap";
+
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        uri,
+                        reqString,
+                        m_Auth);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "success"))
+                    {
+                        return true;
+                    }
+                    else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure"))
+                    {
+                        m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Delete failed: {0}", replyData["Message"].ToString());
+                        reason = replyData["Message"].ToString();
+                        return false;
+                    }
+                    else if (!replyData.ContainsKey("Result"))
+                    {
+                        m_log.DebugFormat("[MAP IMAGE CONNECTOR]: reply data does not contain result field");
+                    }
+                    else
+                    {
+                        m_log.DebugFormat("[MAP IMAGE CONNECTOR]: unexpected result {0}", replyData["Result"].ToString());
+                        reason = "Unexpected result " + replyData["Result"].ToString();
+                    }
+
+                }
+                else
+                {
+                    m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply");
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting map server at {0}: {1}", uri, e.Message);
+            }
+            finally
+            {
+                // This just dumps a warning for any operation that takes more than 100 ms
+                int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+                m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile deleted in {0}ms", tickdiff);
+            }
+
+            return false;
         }
 
         public bool RemoveMapTile(int x, int y, UUID scopeID, out string reason)
@@ -165,7 +228,8 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 245703c..e236ec3 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors
         public virtual GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
             uint x = 0, y = 0;
-            Utils.LongToUInts(regionHandle, out x, out y);
+            Util.RegionHandleToWorldLoc(regionHandle, out x, out y);
             GridRegion regInfo = m_GridService.GetRegionByPosition(thisRegion.ScopeID, (int)x, (int)y);
             if ((regInfo != null) &&
                 // Don't remote-call this instance; that's a startup hickup
@@ -97,9 +97,9 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-                m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICES CONNECTOR]: Unable to parse uri {0} to send HelloNeighbour from {1} to {2}.  Exception {3}{4}",
-                    uri, thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
+                m_log.Warn(string.Format(
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Unable to parse uri {0} to send HelloNeighbour from {1} to {2}.  Exception {3} ",
+                    uri, thisRegion.RegionName, region.RegionName, e.Message), e);
 
                 return false;
             }
@@ -116,9 +116,9 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-                m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICES CONNECTOR]: PackRegionInfoData failed for HelloNeighbour from {0} to {1}.  Exception {2}{3}",
-                    thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
+                m_log.Warn(string.Format(
+                    "[NEIGHBOUR SERVICES CONNECTOR]: PackRegionInfoData failed for HelloNeighbour from {0} to {1}.  Exception {2} ",
+                    thisRegion.RegionName, region.RegionName, e.Message), e);
 
                 return false;
             }
@@ -136,9 +136,9 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-                m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICES CONNECTOR]: Exception thrown on serialization of HelloNeighbour from {0} to {1}.  Exception {2}{3}",
-                    thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
+                m_log.Warn(string.Format(
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Exception thrown on serialization of HelloNeighbour from {0} to {1}.  Exception {2} ",
+                    thisRegion.RegionName, region.RegionName, e.Message), e);
 
                 return false;
             }
@@ -153,16 +153,22 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
+<<<<<<< HEAD
+                m_log.Warn(string.Format(
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Unable to send HelloNeighbour from {0} to {1} (uri {2}).  Exception {3} ",
+                    thisRegion.RegionName, region.RegionName, uri, e.Message), e);
+=======
 //                m_log.WarnFormat(
 //                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}.  Exception {2}{3}",
 //                    thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
+>>>>>>> avn/ubitvar
 
                 return false;
             }
             finally
             {
                 if (os != null)
-                    os.Close();
+                    os.Dispose();
             }
 
             // Let's wait for the response
@@ -192,9 +198,9 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-                m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICES CONNECTOR]: Exception on reply of DoHelloNeighbourCall from {0} back to {1}.  Exception {2}{3}",
-                    region.RegionName, thisRegion.RegionName, e.Message, e.StackTrace);
+                m_log.Warn(string.Format(
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Exception on reply of DoHelloNeighbourCall from {0} back to {1}.  Exception {2} ",
+                    region.RegionName, thisRegion.RegionName, e.Message), e);
 
                 return false;
             }
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
index 378aab6..e474d41 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Server.Base;
@@ -40,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class PresenceServicesConnector : IPresenceService
+    public class PresenceServicesConnector : BaseServiceConnector, IPresenceService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -80,6 +81,8 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("Presence connector init error");
             }
             m_ServerURI = serviceURI;
+
+            base.Initialise(source, "PresenceService");
         }
 
 
@@ -104,7 +107,8 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString, 
+                        m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -149,7 +153,8 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -193,7 +198,8 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -238,7 +244,8 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply != string.Empty)
                 {
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -283,7 +290,8 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply == null || (reply != null && reply == string.Empty))
                 {
                     m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgent received null or empty reply");
@@ -293,6 +301,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
+                return null;
             }
 
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -338,7 +347,8 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply == null || (reply != null && reply == string.Empty))
                 {
                     m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgents received null or empty reply");
diff --git a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
index bc89f5d..2af2ec1 100644
--- a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
index 95e4bab..cd4781d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             Util.FireAndForget(delegate(object o)
             {
                 m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-            });
+            }, null, "SimianActivityDetector.SetLastPositionOnMakeRootAgent");
         }
 
         public void OnNewClient(IClientAPI client)
@@ -94,7 +94,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             Util.FireAndForget(delegate(object o)
             {
                 m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-            });
+            }, null, "SimianActivityDetector.SetLastPositionOnEnteringNewParcel");
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 6f8d9ed..9ad4a7a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -225,12 +225,32 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 {
                     AssetBase asset = SimianGetOperation(id);
                     handler(id, sender, asset);
-                }
+                }, null, "SimianAssetServiceConnector.GetFromService"
             );
 
             return true;
         }
 
+        public bool[] AssetsExist(string[] ids)
+        {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
+
+            bool[] exist = new bool[ids.Length];
+
+            for (int i = 0; i < ids.Length; i++)
+            {
+                AssetMetadata metadata = GetMetadata(ids[i]);
+                if (metadata != null)
+                    exist[i] = true;
+            }
+
+            return exist;
+        }
+
         /// <summary>
         /// Creates a new asset
         /// </summary>
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index 9898da9..a35d749 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -39,8 +39,8 @@ using OpenSim.Services.Interfaces;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
-[assembly: Addin("SimianGrid", "1.0")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("SimianGrid", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 
 namespace OpenSim.Services.Connectors.SimianGrid
 {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
index b999509..8375c95 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -181,7 +181,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             m_log.DebugFormat("[SIMIAN MAPTILE]: upload maptile for {0}",scene.RegionInfo.RegionName);
 
             // Create a PNG map tile and upload it to the AddMapTile API
-            byte[] pngData = Utils.EmptyBytes;
             IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>();
             if (tileGenerator == null)
             {
@@ -189,93 +188,79 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 return;
             }
 
-            using (Image mapTile = tileGenerator.CreateMapTile())
+            using (Bitmap mapTile = tileGenerator.CreateMapTile())
             {
-                using (MemoryStream stream = new MemoryStream())
+                if (mapTile != null)
+                {
+                    // If the region/maptile is legacy sized, just upload the one tile like it has always been done
+                    if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize)
+                    {
+                        ConvertAndUploadMaptile(mapTile, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY);
+                    }
+                    else
+                    {
+                        // For larger regions (varregion) we must cut the region image into legacy sized
+                        //    pieces since that is how the maptile system works.
+                        // Note the assumption that varregions are always a multiple of legacy size.
+                        for (uint xx = 0; xx < mapTile.Width; xx += Constants.RegionSize)
+                        {
+                            for (uint yy = 0; yy < mapTile.Height; yy += Constants.RegionSize)
+                            {
+                                // Images are addressed from the upper left corner so have to do funny
+                                //     math to pick out the sub-tile since regions are numbered from
+                                //     the lower left.
+                                Rectangle rect = new Rectangle(
+                                            (int)xx,
+                                            mapTile.Height - (int)yy - (int)Constants.RegionSize,
+                                            (int)Constants.RegionSize, (int)Constants.RegionSize);
+
+                                using (Bitmap subMapTile = mapTile.Clone(rect, mapTile.PixelFormat))
+                                {
+                                    uint locX = scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize);
+                                    uint locY = scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize);
+                                    
+                                    ConvertAndUploadMaptile(subMapTile, locX, locY);
+                                }
+                            }
+                        }
+                    }
+                }
+                else
                 {
-                    mapTile.Save(stream, ImageFormat.Png);
-                    pngData = stream.ToArray();
+                    m_log.WarnFormat("[SIMIAN MAPTILE] Tile image generation failed");
                 }
             }
 
+        }
+        
+        ///<summary>
+        ///
+        ///</summary>
+        private void ConvertAndUploadMaptile(Image mapTile, uint locX, uint locY)
+        {
+            //m_log.DebugFormat("[SIMIAN MAPTILE]: upload maptile for location {0}, {1}", locX, locY);
+
+            byte[] pngData = Utils.EmptyBytes;
+            using (MemoryStream stream = new MemoryStream())
+            {
+                mapTile.Save(stream, ImageFormat.Png);
+                pngData = stream.ToArray();
+            }
+
             NameValueCollection requestArgs = new NameValueCollection
                 {
-                        { "RequestMethod", "xAddMapTile" },
-                        { "X", scene.RegionInfo.RegionLocX.ToString() },
-                        { "Y", scene.RegionInfo.RegionLocY.ToString() },
-                        { "ContentType", "image/png" },
-                        { "EncodedData", System.Convert.ToBase64String(pngData) }
+                    { "RequestMethod", "xAddMapTile" },
+                    { "X", locX.ToString() },
+                    { "Y", locY.ToString() },
+                    { "ContentType", "image/png" },
+                    { "EncodedData", System.Convert.ToBase64String(pngData) }
                 };
                             
             OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
             if (! response["Success"].AsBoolean())
             {
                 m_log.WarnFormat("[SIMIAN MAPTILE] failed to store map tile; {0}",response["Message"].AsString());
-                return;
             }
-
-            // List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
-            // {
-            //     new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()),
-            //     new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()),
-            //     new MultipartForm.File("Tile", "tile.png", "image/png", pngData)
-            // };
-
-            // string errorMessage = null;
-            // int tickstart = Util.EnvironmentTickCount();
-
-            // // Make the remote storage request
-            // try
-            // {
-            //     HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
-            //     request.Timeout = 20000;
-            //     request.ReadWriteTimeout = 5000;
-
-            //     using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
-            //     {
-            //         using (Stream responseStream = response.GetResponseStream())
-            //         {
-            //             string responseStr = responseStream.GetStreamString();
-            //             OSD responseOSD = OSDParser.Deserialize(responseStr);
-            //             if (responseOSD.Type == OSDType.Map)
-            //             {
-            //                 OSDMap responseMap = (OSDMap)responseOSD;
-            //                 if (responseMap["Success"].AsBoolean())
-            //                     return;
-
-            //                 errorMessage = "Upload failed: " + responseMap["Message"].AsString();
-            //             }
-            //             else
-            //             {
-            //                 errorMessage = "Response format was invalid:\n" + responseStr;
-            //             }
-            //         }
-            //     }
-            // }
-            // catch (WebException we)
-            // {
-            //     errorMessage = we.Message;
-            //     if (we.Status == WebExceptionStatus.ProtocolError)
-            //     {
-            //         HttpWebResponse webResponse = (HttpWebResponse)we.Response;
-            //         errorMessage = String.Format("[{0}] {1}",
-            //                                      webResponse.StatusCode,webResponse.StatusDescription);
-            //     }
-            // }
-            // catch (Exception ex)
-            // {
-            //     errorMessage = ex.Message;
-            // }
-            // finally
-            // {
-            //     // This just dumps a warning for any operation that takes more than 100 ms
-            //     int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
-            //     m_log.DebugFormat("[SIMIAN MAPTILE]: map tile uploaded in {0}ms",tickdiff);
-            // }
-
-            // m_log.WarnFormat("[SIMIAN MAPTILE]: Failed to store {0} byte tile for {1}: {2}",
-            //                  pngData.Length, scene.RegionInfo.RegionName, errorMessage);
-
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 312832f..6043b70 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -167,10 +167,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            const int NEIGHBOR_RADIUS = 128;
-
             GridRegion region = GetRegionByUUID(scopeID, regionID);
 
+            int NEIGHBOR_RADIUS = Math.Max(region.RegionSizeX, region.RegionSizeY) / 2;
+
             if (region != null)
             {
                 List<GridRegion> regions = GetRegionRange(scopeID,
@@ -413,6 +413,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
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 97eaabe..e793420 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -74,6 +74,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
 //        private object m_gestureSyncRoot = new object();
         private bool m_Enabled = false;
 
+        private const double CACHE_EXPIRATION_SECONDS = 20.0;
+        private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache;
+
         #region ISharedRegionModule
 
         public Type ReplaceableInterface { get { return null; } }
@@ -99,6 +102,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 url = url + '/';
             m_serverUrl = url;
 
+            if (m_ItemCache == null)
+                m_ItemCache = new ExpiringCache<UUID, InventoryItemBase>();
+
         }
 
         public void Initialise(IConfigSource source)
@@ -132,6 +138,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         {
                             m_userServerUrl = serviceUrl;
                             m_Enabled = true;
+                            if (m_ItemCache == null)
+                                m_ItemCache = new ExpiringCache<UUID, InventoryItemBase>();
                         }
                     }
                 }
@@ -197,37 +205,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
         }
 
         /// <summary>
-        /// Synchronous inventory fetch.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        [Obsolete]
-        public InventoryCollection GetUserInventory(UUID userID)
-        {
-            m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID);
-
-            InventoryCollection inventory = new InventoryCollection();
-            inventory.UserID = userID;
-            inventory.Folders = new List<InventoryFolderBase>();
-            inventory.Items = new List<InventoryItemBase>();
-
-            return inventory;
-        }
-
-        /// <summary>
-        /// Request the inventory for a user.  This is an asynchronous operation that will call the callback when the
-        /// inventory has been received
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="callback"></param>
-        [Obsolete]
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
-        {
-            m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID);
-            callback(new List<InventoryFolderImpl>(0), new List<InventoryItemBase>(0));
-        }
-
-        /// <summary>
         /// Retrieve the root inventory folder for the given user.
         /// </summary>
         /// <param name="userID"></param>
@@ -263,7 +240,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         /// <param name="userID"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        public InventoryFolderBase GetFolderForType(UUID userID, FolderType type)
         {
             string contentType = SLUtil.SLAssetTypeToContentType((int)type);
 
@@ -302,6 +279,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
         /// <returns></returns>
         public InventoryItemBase GetItem(InventoryItemBase item)
         {
+            InventoryItemBase retrieved = null;
+            if (m_ItemCache.TryGetValue(item.ID, out retrieved))
+                return retrieved;
+
             NameValueCollection requestArgs = new NameValueCollection
             {
                 { "RequestMethod", "GetInventoryNode" },
@@ -323,7 +304,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     for (int i = 0; i < items.Count; i++)
                     {
                         if (items[i].ID == item.ID)
-                            return items[i];
+                        {
+                            retrieved = items[i];
+                            m_ItemCache.AddOrUpdate(item.ID, retrieved, CACHE_EXPIRATION_SECONDS);
+                            return retrieved;
+                        }
                     }
                 }
             }
@@ -332,6 +317,21 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return null;
         }
 
+        public InventoryItemBase[] GetMultipleItems(UUID principalID, UUID[] itemIDs)
+        {
+            InventoryItemBase[] result = new InventoryItemBase[itemIDs.Length];
+            int i = 0;
+            InventoryItemBase item = new InventoryItemBase();
+            item.Owner = principalID;
+            foreach (UUID id in itemIDs)
+            {
+                item.ID = id;
+                result[i++] = GetItem(item);
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// Get a folder, given by its UUID
         /// </summary>
@@ -371,7 +371,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             InventoryCollection inventory = new InventoryCollection();
-            inventory.UserID = userID;
+            inventory.OwnerID = userID;
 
             NameValueCollection requestArgs = new NameValueCollection
             {
@@ -402,6 +402,18 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return inventory;
         }
 
+        public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
+        {
+            InventoryCollection[] invColl = new InventoryCollection[folderIDs.Length];
+            int i = 0;
+            foreach (UUID fid in folderIDs)
+            {
+                invColl[i++] = GetFolderContent(principalID, fid);
+            }
+
+            return invColl;
+        }
+
         /// <summary>
         /// Gets the items inside a folder
         /// </summary>
@@ -411,7 +423,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
         {
             InventoryCollection inventory = new InventoryCollection();
-            inventory.UserID = userID;
+            inventory.OwnerID = userID;
 
             NameValueCollection requestArgs = new NameValueCollection
             {
@@ -568,7 +580,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // A folder of UUID.Zero means we need to find the most appropriate home for this item
             if (item.Folder == UUID.Zero)
             {
-                InventoryFolderBase folder = GetFolderForType(item.Owner, (AssetType)item.AssetType);
+                InventoryFolderBase folder = null;
+                if (Enum.IsDefined(typeof(FolderType), (sbyte)item.AssetType))
+                    folder = GetFolderForType(item.Owner, (FolderType)item.AssetType);
                 if (folder != null && folder.ID != UUID.Zero)
                     item.Folder = folder.ID;
                 else
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index 684a0db..8fc766d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -425,7 +425,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         estate.EstateID, admin.Name);
 
                     estate.EstateOwner = admin.PrincipalID;
-                    estate.Save();
+                    scene.EstateDataService.StoreEstateSettings(estate);
                 }
                 else
                 {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index fdc8697..08c5c50 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -191,9 +191,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return accounts;
         }
 
+<<<<<<< HEAD
+        public void InvalidateCache(UUID userID)
+        {
+            m_accountCache.Remove(userID);
+=======
         public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
         {
             return null;
+>>>>>>> avn/ubitvar
         }
 
         public bool StoreUserAccount(UserAccount data)
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 75c5b35..28b6de7 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -79,22 +79,32 @@ namespace OpenSim.Services.Connectors.Simulation
             return "agent/";
         }
 
-        protected virtual void PackData(OSDMap args, AgentCircuitData aCircuit, GridRegion destination, uint flags)
+        protected virtual void PackData(OSDMap args, GridRegion source, AgentCircuitData aCircuit, GridRegion destination, uint flags)
         {
-                args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
-                args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
-                args["destination_name"] = OSD.FromString(destination.RegionName);
-                args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
-                args["teleport_flags"] = OSD.FromString(flags.ToString());
+            if (source != null)
+            {
+                args["source_x"] = OSD.FromString(source.RegionLocX.ToString());
+                args["source_y"] = OSD.FromString(source.RegionLocY.ToString());
+                args["source_name"] = OSD.FromString(source.RegionName);
+                args["source_uuid"] = OSD.FromString(source.RegionID.ToString());
+                if (!String.IsNullOrEmpty(source.RawServerURI))
+                    args["source_server_uri"] = OSD.FromString(source.RawServerURI);
+            }
+
+            args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
+            args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
+            args["destination_name"] = OSD.FromString(destination.RegionName);
+            args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
+            args["teleport_flags"] = OSD.FromString(flags.ToString());
         }
 
-        public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason)
+        public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason)
         {
             string tmp = String.Empty;
-            return CreateAgent(destination, aCircuit, flags, out tmp, out reason);
+            return CreateAgent(source, destination, aCircuit, flags, out tmp, out reason);
         }
 
-        public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason)
+        public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason)
         {
             m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI);
             reason = String.Empty;
@@ -112,7 +122,7 @@ namespace OpenSim.Services.Connectors.Simulation
             try
             {
                 OSDMap args = aCircuit.PackAgentCircuitData();
-                PackData(args, aCircuit, destination, flags);
+                PackData(args, source, aCircuit, destination, flags);
 
                 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
                 bool success = result["success"].AsBoolean();
@@ -127,7 +137,7 @@ namespace OpenSim.Services.Connectors.Simulation
                 }
               
                 // Try the old version, uncompressed
-                result = WebUtil.PostToService(uri, args, 30000);
+                result = WebUtil.PostToService(uri, args, 30000, false);
 
                 if (result["Success"].AsBoolean())
                 {
@@ -273,9 +283,13 @@ namespace OpenSim.Services.Connectors.Simulation
         }
 
 
+<<<<<<< HEAD
+        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, List<UUID> featuresAvailable, out string version, out string reason)
+=======
         /// <summary>
         /// </summary>
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, out string version, out string reason)
+>>>>>>> avn/ubitvar
         {
             reason = "Failed to contact destination";
             version = "Unknown";
@@ -292,12 +306,22 @@ namespace OpenSim.Services.Connectors.Simulation
             request.Add("viaTeleport", OSD.FromBoolean(viaTeleport));
             request.Add("position", OSD.FromString(position.ToString()));
             request.Add("my_version", OSD.FromString(myversion));
+<<<<<<< HEAD
+
+            OSDArray features = new OSDArray();
+            foreach (UUID feature in featuresAvailable)
+                features.Add(OSD.FromString(feature.ToString()));
+
+            request.Add("features", features);
+
+=======
+>>>>>>> avn/ubitvar
             if (agentHomeURI != null)
                 request.Add("agent_home_uri", OSD.FromString(agentHomeURI));
 
             try
             {
-                OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false);
+                OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false, false);
                 bool success = result["success"].AsBoolean();
                 if (result.ContainsKey("_Result"))
                 {
@@ -342,9 +366,22 @@ namespace OpenSim.Services.Connectors.Simulation
                     return false;
                 }
 
+<<<<<<< HEAD
+
+                featuresAvailable.Clear();
+
+                if (result.ContainsKey("features"))
+                {
+                    OSDArray array = (OSDArray)result["features"];
+
+                    foreach (OSD o in array)
+                        featuresAvailable.Add(new UUID(o.AsString()));
+                }
+=======
                 OSDMap resp = (OSDMap)result["_Result"];
                 success = resp["success"].AsBoolean();
                 reason = resp["reason"].AsString();
+>>>>>>> avn/ubitvar
 
                 return success;
             }
@@ -364,7 +401,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
+                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false, false);
             }
             catch (Exception e)
             {
@@ -383,7 +420,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
+                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false, false);
             }
             catch (Exception e)
             {
@@ -430,8 +467,17 @@ namespace OpenSim.Services.Connectors.Simulation
                 args["destination_name"] = OSD.FromString(destination.RegionName);
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
 
+<<<<<<< HEAD
+                OSDMap result = WebUtil.PostToService(uri, args, 40000, false);
+
+                if (result == null)
+                    return false;
+                bool success = result["success"].AsBoolean();
+                if (!success)
+=======
                 OSDMap response = WebUtil.PostToService(uri, args, 40000);
                 if (response["Success"] == "False")
+>>>>>>> avn/ubitvar
                     return false;
             }
             catch (Exception e)
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index 6b2d710..e5fb5a8 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -33,13 +33,14 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class UserAccountServicesConnector : IUserAccountService
+    public class UserAccountServicesConnector : BaseServiceConnector, IUserAccountService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -79,6 +80,8 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("User account connector init error");
             }
             m_ServerURI = serviceURI;
+
+            base.Initialise(source, "UserAccountService");
         }
 
         public virtual UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
@@ -144,7 +147,8 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply == null || (reply != null && reply == string.Empty))
                 {
                     m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received null or empty reply");
@@ -187,9 +191,14 @@ namespace OpenSim.Services.Connectors
             return accounts;
         }
 
+<<<<<<< HEAD
+        public void InvalidateCache(UUID userID)
+        {
+=======
         public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
         {
             return null; // Not implemented for regions
+>>>>>>> avn/ubitvar
         }
 
         public virtual bool StoreUserAccount(UserAccount data)
@@ -212,9 +221,39 @@ namespace OpenSim.Services.Connectors
                 sendData[kvp.Key] = kvp.Value.ToString();
             }
 
-            return SendAndGetBoolReply(sendData);
+            if (SendAndGetReply(sendData) != null)
+                return true;
+            else
+                return false;
         }
 
+        /// <summary>
+        /// Create user remotely. Note this this is not part of the IUserAccountsService
+        /// </summary>
+        /// <param name="first"></param>
+        /// <param name="last"></param>
+        /// <param name="password"></param>
+        /// <param name="email"></param>
+        /// <param name="scopeID"></param>
+        /// <returns></returns>
+        public virtual UserAccount CreateUser(string first, string last, string password, string email, UUID scopeID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "createuser";
+
+            sendData["FirstName"] = first;
+            sendData["LastName"] = last;
+            sendData["Password"] = password;
+            if (!string.IsNullOrEmpty(email))
+                sendData["Email"] = first;
+            sendData["ScopeID"] = scopeID.ToString();
+
+            return SendAndGetReply(sendData);
+        }
+        
         private UserAccount SendAndGetReply(Dictionary<string, object> sendData)
         {
             string reply = string.Empty;
@@ -225,7 +264,8 @@ namespace OpenSim.Services.Connectors
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply == null || (reply != null && reply == string.Empty))
                 {
                     m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccount received null or empty reply");
@@ -256,14 +296,16 @@ namespace OpenSim.Services.Connectors
         {
             string reqString = ServerUtils.BuildQueryString(sendData);
             string uri = m_ServerURI + "/accounts";
-            // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
+            //m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
             try
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString);
+                        reqString,
+                        m_Auth);
                 if (reply != string.Empty)
                 {
+                    //m_log.DebugFormat("[ACCOUNTS CONNECTOR]: reply = {0}", reply);
                     Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
 
                     if (replyData.ContainsKey("result"))
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/EstateService/EstateDataService.cs
index cdcdecf..f6a8654 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/EstateService/EstateDataService.cs
@@ -29,17 +29,14 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using System.Reflection;
 using OpenSim.Services.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Data;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Services.Connectors
+namespace OpenSim.Services.EstateService
 {
     public class EstateDataService : ServiceBase, IEstateDataService
     {
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs
new file mode 100644
index 0000000..1bab687
--- /dev/null
+++ b/OpenSim/Services/FSAssetService/FSAssetService.cs
@@ -0,0 +1,723 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Text;
+using System.Threading;
+using System.Reflection;
+using OpenSim.Data;
+using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
+using OpenSim.Framework.Console;
+using OpenSim.Server.Base;
+using OpenSim.Services.Base;
+using OpenSim.Services.Interfaces;
+using Nini.Config;
+using log4net;
+using OpenMetaverse;
+using System.Security.Cryptography;
+
+namespace OpenSim.Services.FSAssetService
+{
+    public class FSAssetConnector : ServiceBase, IAssetService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        static System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+        static SHA256CryptoServiceProvider SHA256 = new SHA256CryptoServiceProvider();
+
+        static byte[] ToCString(string s)
+        {
+            byte[] ret = enc.GetBytes(s);
+            Array.Resize(ref ret, ret.Length + 1);
+            ret[ret.Length - 1] = 0;
+
+            return ret;
+        }
+
+        protected IAssetLoader m_AssetLoader = null;
+        protected IFSAssetDataPlugin m_DataConnector = null;
+        protected IAssetService m_FallbackService;
+        protected Thread m_WriterThread;
+        protected Thread m_StatsThread;
+        protected string m_SpoolDirectory;
+        protected object m_readLock = new object();
+        protected object m_statsLock = new object();
+        protected int m_readCount = 0;
+        protected int m_readTicks = 0;
+        protected int m_missingAssets = 0;
+        protected int m_missingAssetsFS = 0;
+        protected string m_FSBase;
+
+        private static bool m_Initialized;
+        private bool m_MainInstance;
+
+        public FSAssetConnector(IConfigSource config)
+            : this(config, "AssetService")
+        {
+        }
+
+        public FSAssetConnector(IConfigSource config, string configName) : base(config)
+        {
+            if (!m_Initialized)
+            {
+                m_Initialized = true;
+                m_MainInstance = true;
+
+                MainConsole.Instance.Commands.AddCommand("fs", false,
+                        "show assets", "show assets", "Show asset stats",
+                        HandleShowAssets);
+                MainConsole.Instance.Commands.AddCommand("fs", false,
+                        "show digest", "show digest <ID>", "Show asset digest",
+                        HandleShowDigest);
+                MainConsole.Instance.Commands.AddCommand("fs", false,
+                        "delete asset", "delete asset <ID>",
+                        "Delete asset from database",
+                        HandleDeleteAsset);
+                MainConsole.Instance.Commands.AddCommand("fs", false,
+                        "import", "import <conn> <table> [<start> <count>]",
+                        "Import legacy assets",
+                        HandleImportAssets);
+                MainConsole.Instance.Commands.AddCommand("fs", false,
+                        "force import", "force import <conn> <table> [<start> <count>]",
+                        "Import legacy assets, overwriting current content",
+                        HandleImportAssets);
+            }
+
+            IConfig assetConfig = config.Configs[configName];
+            
+            if (assetConfig == null)
+                throw new Exception("No AssetService configuration");
+
+            // Get Database Connector from Asset Config (If present)
+            string dllName = assetConfig.GetString("StorageProvider", string.Empty);
+            string m_ConnectionString = assetConfig.GetString("ConnectionString", string.Empty);
+            string m_Realm = assetConfig.GetString("Realm", "fsassets");
+
+            int SkipAccessTimeDays = assetConfig.GetInt("DaysBetweenAccessTimeUpdates", 0);
+
+            // If not found above, fallback to Database defaults
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            
+            if (dbConfig != null)
+            {
+                if (dllName == String.Empty)
+                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                
+                if (m_ConnectionString == String.Empty)
+                    m_ConnectionString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
+
+            // No databse connection found in either config
+            if (dllName.Equals(String.Empty))
+                throw new Exception("No StorageProvider configured");
+
+            if (m_ConnectionString.Equals(String.Empty))
+                throw new Exception("Missing database connection string");
+
+            // Create Storage Provider
+            m_DataConnector = LoadPlugin<IFSAssetDataPlugin>(dllName);
+
+            if (m_DataConnector == null)
+                throw new Exception(string.Format("Could not find a storage interface in the module {0}", dllName));
+
+            // Initialize DB And perform any migrations required
+            m_DataConnector.Initialise(m_ConnectionString, m_Realm, SkipAccessTimeDays);
+
+            // Setup Fallback Service
+            string str = assetConfig.GetString("FallbackService", string.Empty);
+            
+            if (str != string.Empty)
+            {
+                object[] args = new object[] { config };
+                m_FallbackService = LoadPlugin<IAssetService>(str, args);
+                if (m_FallbackService != null)
+                {
+                    m_log.Info("[FSASSETS]: Fallback service loaded");
+                }
+                else
+                {
+                    m_log.Error("[FSASSETS]: Failed to load fallback service");
+                }
+            }
+
+            // Setup directory structure including temp directory
+            m_SpoolDirectory = assetConfig.GetString("SpoolDirectory", "/tmp");
+
+            string spoolTmp = Path.Combine(m_SpoolDirectory, "spool");
+
+            Directory.CreateDirectory(spoolTmp);
+
+            m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty);
+            if (m_FSBase == String.Empty)
+            {
+                m_log.ErrorFormat("[FSASSETS]: BaseDirectory not specified");
+                throw new Exception("Configuration error");
+            }
+
+            if (m_MainInstance)
+            {
+                string loader = assetConfig.GetString("DefaultAssetLoader", string.Empty);
+                if (loader != string.Empty)
+                {
+                    m_AssetLoader = LoadPlugin<IAssetLoader>(loader);
+                    string loaderArgs = assetConfig.GetString("AssetLoaderArgs", string.Empty);
+                    m_log.InfoFormat("[FSASSETS]: Loading default asset set from {0}", loaderArgs);
+                    m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs,
+                            delegate(AssetBase a)
+                            {
+                                Store(a, false);
+                            });
+                }
+            
+                m_WriterThread = new Thread(Writer);
+                m_WriterThread.Start();
+                m_StatsThread = new Thread(Stats);
+                m_StatsThread.Start();
+            }
+            
+            m_log.Info("[FSASSETS]: FS asset service enabled");
+        }
+
+        private void Stats()
+        {
+            while (true)
+            {
+                Thread.Sleep(60000);
+                 
+                lock (m_statsLock)
+                {
+                    if (m_readCount > 0)
+                    {
+                        double avg = (double)m_readTicks / (double)m_readCount;
+//                        if (avg > 10000)
+//                            Environment.Exit(0);
+                        m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS);
+                    }
+                    m_readCount = 0;
+                    m_readTicks = 0;
+                    m_missingAssets = 0;
+                    m_missingAssetsFS = 0;
+                }
+            }
+        }
+
+        private void Writer()
+        {
+            m_log.Info("[FSASSETS]: Writer started");
+
+            while (true)
+            {
+                string[] files = Directory.GetFiles(m_SpoolDirectory);
+
+                if (files.Length > 0)
+                {
+                    int tickCount = Environment.TickCount;
+                    for (int i = 0 ; i < files.Length ; i++)
+                    {
+                        string hash = Path.GetFileNameWithoutExtension(files[i]);
+                        string s = HashToFile(hash);
+                        string diskFile = Path.Combine(m_FSBase, s);
+
+                        Directory.CreateDirectory(Path.GetDirectoryName(diskFile));
+                        try
+                        {
+                            byte[] data = File.ReadAllBytes(files[i]);
+
+                            using (GZipStream gz = new GZipStream(new FileStream(diskFile + ".gz", FileMode.Create), CompressionMode.Compress))
+                            {
+                                gz.Write(data, 0, data.Length);
+                                gz.Close();
+                            }
+                            File.Delete(files[i]);
+
+                            //File.Move(files[i], diskFile);
+                        }
+                        catch(System.IO.IOException e)
+                        {
+                            if (e.Message.StartsWith("Win32 IO returned ERROR_ALREADY_EXISTS"))
+                                File.Delete(files[i]);
+                            else
+                                throw;
+                        }
+                    }
+                    int totalTicks = System.Environment.TickCount - tickCount;
+                    if (totalTicks > 0) // Wrap?
+                    {
+                        m_log.InfoFormat("[FSASSETS]: Write cycle complete, {0} files, {1} ticks, avg {2:F2}", files.Length, totalTicks, (double)totalTicks / (double)files.Length);
+                    }
+                }
+
+                Thread.Sleep(1000);
+            }
+        }
+
+        string GetSHA256Hash(byte[] data)
+        {
+            byte[] hash = SHA256.ComputeHash(data);
+
+            return BitConverter.ToString(hash).Replace("-", String.Empty);
+        }
+
+        public string HashToPath(string hash)
+        {
+            if (hash == null || hash.Length < 10)
+                return "junkyard";
+
+            return Path.Combine(hash.Substring(0, 3),
+                   Path.Combine(hash.Substring(3, 3)));
+            /*
+             * The below is what core would normally use.
+             * This is modified to work in OSGrid, as seen
+             * above, because the SRAS data is structured
+             * that way.
+             */
+            /*
+            return Path.Combine(hash.Substring(0, 2),
+                   Path.Combine(hash.Substring(2, 2),
+                   Path.Combine(hash.Substring(4, 2),
+                   hash.Substring(6, 4))));
+            */
+        }
+
+        private bool AssetExists(string hash)
+        {
+            string s = HashToFile(hash);
+            string diskFile = Path.Combine(m_FSBase, s);
+
+            if (File.Exists(diskFile + ".gz") || File.Exists(diskFile))
+                return true;
+
+            return false;
+        }
+
+        public virtual bool[] AssetsExist(string[] ids)
+        {
+            UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id));
+            return m_DataConnector.AssetsExist(uuid);
+        }
+
+        public string HashToFile(string hash)
+        {
+            return Path.Combine(HashToPath(hash), hash);
+        }
+
+        public virtual AssetBase Get(string id)
+        {
+            string hash;
+
+            return Get(id, out hash);
+        }
+
+        private AssetBase Get(string id, out string sha)
+        {
+            string hash = string.Empty;
+
+            int startTime = System.Environment.TickCount;
+            AssetMetadata metadata;
+
+            lock (m_readLock)
+            {
+                metadata = m_DataConnector.Get(id, out hash);
+            }
+
+            sha = hash;
+
+            if (metadata == null)
+            {
+                AssetBase asset = null;
+                if (m_FallbackService != null)
+                {
+                    asset = m_FallbackService.Get(id);
+                    if (asset != null)
+                    {
+                        asset.Metadata.ContentType =
+                                SLUtil.SLAssetTypeToContentType((int)asset.Type);
+                        sha = GetSHA256Hash(asset.Data);
+                        m_log.InfoFormat("[FSASSETS]: Added asset {0} from fallback to local store", id);
+                        Store(asset);
+                    }
+                }
+                if (asset == null)
+                {
+                    // m_log.InfoFormat("[FSASSETS]: Asset {0} not found", id);
+                    m_missingAssets++;
+                }
+                return asset;
+            }
+            AssetBase newAsset = new AssetBase();
+            newAsset.Metadata = metadata;
+            try
+            {
+                newAsset.Data = GetFsData(hash);
+                if (newAsset.Data.Length == 0)
+                {
+                    AssetBase asset = null;
+                    if (m_FallbackService != null)
+                    {
+                        asset = m_FallbackService.Get(id);
+                        if (asset != null)
+                        {
+                            asset.Metadata.ContentType =
+                                    SLUtil.SLAssetTypeToContentType((int)asset.Type);
+                            sha = GetSHA256Hash(asset.Data);
+                            m_log.InfoFormat("[FSASSETS]: Added asset {0} from fallback to local store", id);
+                            Store(asset);
+                        }
+                    }
+                    if (asset == null)
+                        m_missingAssetsFS++;
+                    // m_log.InfoFormat("[FSASSETS]: Asset {0}, hash {1} not found in FS", id, hash);
+                    else
+                    {
+                        // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+                        // Fix bad assets before sending them elsewhere
+                        if (asset.Type == (int)AssetType.Object && asset.Data != null)
+                        {
+                            string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+                            asset.Data = Utils.StringToBytes(xml);
+                        }
+                        return asset;
+                    }
+                }
+
+                lock (m_statsLock)
+                {
+                    m_readTicks += Environment.TickCount - startTime;
+                    m_readCount++;
+                }
+
+                // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+                // Fix bad assets before sending them elsewhere
+                if (newAsset.Type == (int)AssetType.Object && newAsset.Data != null)
+                {
+                    string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(newAsset.Data));
+                    newAsset.Data = Utils.StringToBytes(xml);
+                }
+
+                return newAsset;
+            }
+            catch (Exception exception)
+            {
+                m_log.Error(exception.ToString());
+                Thread.Sleep(5000);
+                Environment.Exit(1);
+                return null;
+            }
+        }
+
+        public virtual AssetMetadata GetMetadata(string id)
+        {
+            string hash;
+            return m_DataConnector.Get(id, out hash);
+        }
+
+        public virtual byte[] GetData(string id)
+        {
+            string hash;
+            if (m_DataConnector.Get(id, out hash) == null)
+                return null;
+
+            return GetFsData(hash);
+        }
+
+        public bool Get(string id, Object sender, AssetRetrieved handler)
+        {
+            AssetBase asset = Get(id);
+
+            handler(id, sender, asset);
+
+            return true;
+        }
+
+        public byte[] GetFsData(string hash)
+        {
+            string spoolFile = Path.Combine(m_SpoolDirectory, hash + ".asset");
+
+            if (File.Exists(spoolFile))
+            {
+                try
+                {
+                    byte[] content = File.ReadAllBytes(spoolFile);
+
+                    return content;
+                }
+                catch
+                {
+                }
+            }
+
+            string file = HashToFile(hash);
+            string diskFile = Path.Combine(m_FSBase, file);
+
+            if (File.Exists(diskFile + ".gz"))
+            {
+                try
+                {
+                    using (GZipStream gz = new GZipStream(new FileStream(diskFile + ".gz", FileMode.Open, FileAccess.Read), CompressionMode.Decompress))
+                    {
+                        using (MemoryStream ms = new MemoryStream())
+                        {
+                            byte[] data = new byte[32768];
+                            int bytesRead;
+
+                            do
+                            {
+                                bytesRead = gz.Read(data, 0, 32768);
+                                if (bytesRead > 0)
+                                    ms.Write(data, 0, bytesRead);
+                            } while (bytesRead > 0);
+
+                            return ms.ToArray();
+                        }
+                    }
+                }
+                catch (Exception)
+                {
+                    return new Byte[0];
+                }
+            }
+            else if (File.Exists(diskFile))
+            {
+                try
+                {
+                    byte[] content = File.ReadAllBytes(diskFile);
+
+                    return content;
+                }
+                catch
+                {
+                }
+            }
+            return new Byte[0];
+
+        }
+
+        public virtual string Store(AssetBase asset)
+        {
+            return Store(asset, false);
+        }
+
+        private string Store(AssetBase asset, bool force)
+        {
+            int tickCount = Environment.TickCount;
+            string hash = GetSHA256Hash(asset.Data);
+
+            if (!AssetExists(hash))
+            {
+                string tempFile = Path.Combine(Path.Combine(m_SpoolDirectory, "spool"), hash + ".asset");
+                string finalFile = Path.Combine(m_SpoolDirectory, hash + ".asset");
+
+                if (!File.Exists(finalFile))
+                {
+                    // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+                    // Fix bad assets before storing on this server
+                    if (asset.Type == (int)AssetType.Object && asset.Data != null)
+                    {
+                        string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+                        asset.Data = Utils.StringToBytes(xml);
+                    }
+
+                    FileStream fs = File.Create(tempFile);
+
+                    fs.Write(asset.Data, 0, asset.Data.Length);
+
+                    fs.Close();
+
+                    File.Move(tempFile, finalFile);
+                }
+            }
+
+            if (asset.ID == string.Empty)
+            {
+                if (asset.FullID == UUID.Zero)
+                {
+                    asset.FullID = UUID.Random();
+                }
+                asset.ID = asset.FullID.ToString();
+            }
+            else if (asset.FullID == UUID.Zero)
+            {
+                UUID uuid = UUID.Zero;
+                if (UUID.TryParse(asset.ID, out uuid))
+                {
+                    asset.FullID = uuid;
+                }
+                else
+                {
+                    asset.FullID = UUID.Random();
+                }
+            }
+
+            if (!m_DataConnector.Store(asset.Metadata, hash))
+            {
+                return UUID.Zero.ToString();
+            }
+            else
+            {
+                return asset.ID;
+            }
+        }
+
+        public bool UpdateContent(string id, byte[] data)
+        {
+            return false;
+
+//            string oldhash;
+//            AssetMetadata meta = m_DataConnector.Get(id, out oldhash);
+//
+//            if (meta == null)
+//                return false;
+//
+//            AssetBase asset = new AssetBase();
+//            asset.Metadata = meta;
+//            asset.Data = data;
+//
+//            Store(asset);
+//
+//            return true;
+        }
+
+        public virtual bool Delete(string id)
+        {
+            m_DataConnector.Delete(id);
+
+            return true;
+        }
+
+        private void HandleShowAssets(string module, string[] args)
+        {
+            int num = m_DataConnector.Count();
+            MainConsole.Instance.Output(string.Format("Total asset count: {0}", num));
+        }
+
+        private void HandleShowDigest(string module, string[] args)
+        {
+            if (args.Length < 3)
+            {
+                MainConsole.Instance.Output("Syntax: show digest <ID>");
+                return;
+            }
+
+            string hash;
+            AssetBase asset = Get(args[2], out hash);
+
+            if (asset == null || asset.Data.Length == 0)
+            {   
+                MainConsole.Instance.Output("Asset not found");
+                return;
+            }
+
+            int i;
+
+            MainConsole.Instance.Output(String.Format("Name: {0}", asset.Name));
+            MainConsole.Instance.Output(String.Format("Description: {0}", asset.Description));
+            MainConsole.Instance.Output(String.Format("Type: {0}", asset.Type));
+            MainConsole.Instance.Output(String.Format("Content-type: {0}", asset.Metadata.ContentType));
+            MainConsole.Instance.Output(String.Format("Flags: {0}", asset.Metadata.Flags.ToString()));
+            MainConsole.Instance.Output(String.Format("FS file: {0}", HashToFile(hash)));
+
+            for (i = 0 ; i < 5 ; i++)
+            {
+                int off = i * 16;
+                if (asset.Data.Length <= off)
+                    break;
+                int len = 16;
+                if (asset.Data.Length < off + len)
+                    len = asset.Data.Length - off;
+
+                byte[] line = new byte[len];
+                Array.Copy(asset.Data, off, line, 0, len);
+
+                string text = BitConverter.ToString(line);
+                MainConsole.Instance.Output(String.Format("{0:x4}: {1}", off, text));
+            }
+        }
+
+        private void HandleDeleteAsset(string module, string[] args)
+        {
+            if (args.Length < 3)
+            {
+                MainConsole.Instance.Output("Syntax: delete asset <ID>");
+                return;
+            }
+
+            AssetBase asset = Get(args[2]);
+
+            if (asset == null || asset.Data.Length == 0)
+            {   
+                MainConsole.Instance.Output("Asset not found");
+                return;
+            }
+
+            m_DataConnector.Delete(args[2]);
+
+            MainConsole.Instance.Output("Asset deleted");
+        }
+
+        private void HandleImportAssets(string module, string[] args)
+        {
+            bool force = false;
+            if (args[0] == "force")
+            {
+                force = true;
+                List<string> list = new List<string>(args);
+                list.RemoveAt(0);
+                args = list.ToArray();
+            }
+            if (args.Length < 3)
+            {
+                MainConsole.Instance.Output("Syntax: import <conn> <table> [<start> <count>]");
+            }
+            else
+            {
+                string conn = args[1];
+                string table = args[2];
+                int start = 0;
+                int count = -1;
+                if (args.Length > 3)
+                {
+                    start = Convert.ToInt32(args[3]);
+                }
+                if (args.Length > 4)
+                {
+                    count = Convert.ToInt32(args[4]);
+                }
+                m_DataConnector.Import(conn, table, start, count, force, new FSStoreDelegate(Store));
+            }
+        }
+
+        public AssetBase GetCached(string id)
+        {
+            return Get(id);
+        }
+    }
+}
diff --git a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
index 6bc543a..ca16f08 100644
--- a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
index f9473e2..f258f94 100644
--- a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 6f610f8..8293c18 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -46,6 +46,7 @@ namespace OpenSim.Services.GridService
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
+        private string LogHeader = "[GRID SERVICE]";
 
         private bool m_DeleteOnUnregister = true;
         private static GridService m_RootInstance = null;
@@ -56,7 +57,13 @@ namespace OpenSim.Services.GridService
         protected bool m_AllowDuplicateNames = false;
         protected bool m_AllowHypergridMapSearch = false;
 
+<<<<<<< HEAD
+        protected bool m_SuppressVarregionOverlapCheckOnRegistration = false;
+
+        private static Dictionary<string,object> m_ExtraFeatures = new Dictionary<string, object>();
+=======
         private static Dictionary<string, object> m_ExtraFeatures = new Dictionary<string, object>();
+>>>>>>> avn/ubitvar
 
         public GridService(IConfigSource config)
             : base(config)
@@ -65,6 +72,9 @@ namespace OpenSim.Services.GridService
 
             m_config = config;
             IConfig gridConfig = config.Configs["GridService"];
+
+            bool suppressConsoleCommands = false;
+
             if (gridConfig != null)
             {
                 m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true);
@@ -78,13 +88,19 @@ namespace OpenSim.Services.GridService
                 }
                 m_AllowDuplicateNames = gridConfig.GetBoolean("AllowDuplicateNames", m_AllowDuplicateNames);
                 m_AllowHypergridMapSearch = gridConfig.GetBoolean("AllowHypergridMapSearch", m_AllowHypergridMapSearch);
+
+                m_SuppressVarregionOverlapCheckOnRegistration = gridConfig.GetBoolean("SuppressVarregionOverlapCheckOnRegistration", m_SuppressVarregionOverlapCheckOnRegistration);
+
+                // This service is also used locally by a simulator running in grid mode.  This switches prevents
+                // inappropriate console commands from being registered
+                suppressConsoleCommands = gridConfig.GetBoolean("SuppressConsoleCommands", suppressConsoleCommands);
             }
-            
+
             if (m_RootInstance == null)
             {
                 m_RootInstance = this;
 
-                if (MainConsole.Instance != null)
+                if (!suppressConsoleCommands && MainConsole.Instance != null)
                 {
                     MainConsole.Instance.Commands.AddCommand("Regions", true,
                             "deregister region id",
@@ -93,17 +109,12 @@ namespace OpenSim.Services.GridService
                             String.Empty,
                             HandleDeregisterRegion);
 
-                    // A messy way of stopping this command being added if we are in standalone (since the simulator
-                    // has an identically named command
-                    //
-                    // XXX: We're relying on the OpenSimulator version being registered first, which is not well defined.
-                    if (MainConsole.Instance.Commands.Resolve(new string[] { "show", "regions" }).Length == 0)
-                        MainConsole.Instance.Commands.AddCommand("Regions", true,
-                                "show regions",
-                                "show regions",
-                                "Show details on all regions",
-                                String.Empty,
-                                HandleShowRegions);
+                    MainConsole.Instance.Commands.AddCommand("Regions", true,
+                            "show regions",
+                            "show regions",
+                            "Show details on all regions",
+                            String.Empty,
+                            HandleShowRegions);
 
                     MainConsole.Instance.Commands.AddCommand("Regions", true,
                             "show region name",
@@ -119,13 +130,24 @@ namespace OpenSim.Services.GridService
                             "For example, show region at 1000 1000",
                             HandleShowRegionAt);
 
-                    MainConsole.Instance.Commands.AddCommand("Regions", true,
-                            "set region flags",
-                            "set region flags <Region name> <flags>",
-                            "Set database flags for region",
+                    MainConsole.Instance.Commands.AddCommand("General", true,
+                            "show grid size",
+                            "show grid size",
+                            "Show the current grid size (excluding hyperlink references)",
                             String.Empty,
-                            HandleSetFlags);
+                            HandleShowGridSize);
+
+                    MainConsole.Instance.Commands.AddCommand("Regions", true,
+                             "set region flags",
+                             "set region flags <Region name> <flags>",
+                             "Set database flags for region",
+                             String.Empty,
+                             HandleSetFlags);
                 }
+
+                if (!suppressConsoleCommands)
+                    SetExtraServiceURLs(config);
+
                 m_HypergridLinker = new HypergridLinker(m_config, this, m_Database);
             }
         }
@@ -137,9 +159,15 @@ namespace OpenSim.Services.GridService
 
             if (loginConfig == null || gridConfig == null)
                 return;
+<<<<<<< HEAD
+            
+            string configVal;
+            
+=======
 
             string configVal;
 
+>>>>>>> avn/ubitvar
             configVal = loginConfig.GetString("SearchURL", string.Empty);
             if (!string.IsNullOrEmpty(configVal))
                 m_ExtraFeatures["search-server-url"] = configVal;
@@ -183,14 +211,26 @@ namespace OpenSim.Services.GridService
             if (regionInfos.RegionID == UUID.Zero)
                 return "Invalid RegionID - cannot be zero UUID";
 
+<<<<<<< HEAD
+            String reason = "Region overlaps another region";
+            RegionData region = FindAnyConflictingRegion(regionInfos, scopeID, out reason);
+            // If there is a conflicting region, if it has the same ID and same coordinates
+            //    then it is a region re-registering (permissions and ownership checked later).
+            if ((region != null) 
+                && ( (region.coordX != regionInfos.RegionCoordX)
+                    || (region.coordY != regionInfos.RegionCoordY)
+                    || (region.RegionID != regionInfos.RegionID) )
+                )
+=======
             // we should not need to check for overlaps
 
             RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
             if ((region != null) && (region.RegionID != regionInfos.RegionID))
+>>>>>>> avn/ubitvar
             {
-                m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", 
-                    regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
-                return "Region overlaps another region";
+                // If not same ID and same coordinates, this new region has conflicts and can't be registered.
+                m_log.WarnFormat("{0} Register region conflict in scope {1}. {2}", LogHeader, scopeID, reason);
+                return reason;
             }
 
             if (region != null)
@@ -313,13 +353,121 @@ namespace OpenSim.Services.GridService
                 m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e);
             }
 
-            m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3} with flags {4}", 
-                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY, 
+            m_log.DebugFormat
+                ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", 
+                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, 
+                regionInfos.RegionCoordX, regionInfos.RegionCoordY, 
                 (OpenSim.Framework.RegionFlags)flags);
 
             return String.Empty;
         }
 
+        /// <summary>
+        /// Search the region map for regions conflicting with this region.
+        /// The region to be added is passed and we look for any existing regions that are
+        /// in the requested location, that are large varregions that overlap this region, or
+        /// are previously defined regions that would lie under this new region.
+        /// </summary>
+        /// <param name="regionInfos">Information on region requested to be added to the world map</param>
+        /// <param name="scopeID">Grid id for region</param>
+        /// <param name="reason">The reason the returned region conflicts with passed region</param>
+        /// <returns></returns>
+        private RegionData FindAnyConflictingRegion(GridRegion regionInfos, UUID scopeID, out string reason)
+        {
+            reason = "Reregistration";
+            // First see if there is an existing region right where this region is trying to go
+            // (We keep this result so it can be returned if suppressing errors)
+            RegionData noErrorRegion = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
+            RegionData region = noErrorRegion;
+            if (region != null
+                && region.RegionID == regionInfos.RegionID
+                && region.sizeX == regionInfos.RegionSizeX
+                && region.sizeY == regionInfos.RegionSizeY)
+            {
+                // If this seems to be exactly the same region, return this as it could be
+                //     a re-registration (permissions checked by calling routine).
+                m_log.DebugFormat("{0} FindAnyConflictingRegion: re-register of {1}",
+                                        LogHeader, RegionString(regionInfos));
+                return region;
+            }
+
+            // No region exactly there or we're resizing an existing region.
+            // Fetch regions that could be varregions overlapping requested location.
+            int xmin = regionInfos.RegionLocX - (int)Constants.MaximumRegionSize + 10;
+            int xmax = regionInfos.RegionLocX;
+            int ymin = regionInfos.RegionLocY - (int)Constants.MaximumRegionSize + 10;
+            int ymax = regionInfos.RegionLocY;
+            List<RegionData> rdatas = m_Database.Get(xmin, ymin, xmax, ymax, scopeID);
+            foreach (RegionData rdata in rdatas)
+            {
+                // m_log.DebugFormat("{0} FindAnyConflictingRegion: find existing. Checking {1}", LogHeader, RegionString(rdata) );
+                if ( (rdata.posX + rdata.sizeX > regionInfos.RegionLocX)
+                    && (rdata.posY + rdata.sizeY > regionInfos.RegionLocY) )
+                {
+                    region = rdata;
+                    m_log.WarnFormat("{0} FindAnyConflictingRegion: conflict of {1} by existing varregion {2}",
+                                LogHeader, RegionString(regionInfos), RegionString(region));
+                    reason = String.Format("Region location is overlapped by existing varregion {0}",
+                                                RegionString(region));
+
+                    if (m_SuppressVarregionOverlapCheckOnRegistration)
+                        region = noErrorRegion;
+                    return region;
+                }
+            }
+
+            // There isn't a region that overlaps this potential region.
+            // See if this potential region overlaps an existing region.
+            // First, a shortcut of not looking for overlap if new region is legacy region sized
+            //     and connot overlap anything.
+            if (regionInfos.RegionSizeX != Constants.RegionSize
+                || regionInfos.RegionSizeY != Constants.RegionSize)
+            {
+                // trim range looked for so we don't pick up neighbor regions just off the edges
+                xmin = regionInfos.RegionLocX;
+                xmax = regionInfos.RegionLocX + regionInfos.RegionSizeX - 10;
+                ymin = regionInfos.RegionLocY;
+                ymax = regionInfos.RegionLocY + regionInfos.RegionSizeY - 10;
+                rdatas = m_Database.Get(xmin, ymin, xmax, ymax, scopeID);
+
+                // If the region is being resized, the found region could be ourself.
+                foreach (RegionData rdata in rdatas)
+                {
+                    // m_log.DebugFormat("{0} FindAnyConflictingRegion: see if overlap. Checking {1}", LogHeader, RegionString(rdata) );
+                    if (region == null || region.RegionID != regionInfos.RegionID)
+                    {
+                        region = rdata;
+                        m_log.WarnFormat("{0} FindAnyConflictingRegion: conflict of varregion {1} overlaps existing region {2}",
+                                LogHeader, RegionString(regionInfos), RegionString(region));
+                        reason = String.Format("Region {0} would overlap existing region {1}",
+                                        RegionString(regionInfos), RegionString(region));
+
+                        if (m_SuppressVarregionOverlapCheckOnRegistration)
+                            region = noErrorRegion;
+                        return region;
+                    }
+                }
+            }
+
+            // If we get here, region is either null (nothing found here) or
+            //     is the non-conflicting region found at the location being requested.
+            return region;
+        }
+
+        // String describing name and region location of passed region
+        private String RegionString(RegionData reg)
+        {
+            return String.Format("{0}/{1} at <{2},{3}>",
+                reg.RegionName, reg.RegionID, reg.coordX, reg.coordY);
+        }
+
+        // String describing name and region location of passed region
+        private String RegionString(GridRegion reg)
+        {
+            return String.Format("{0}/{1} at <{2},{3}>",
+                reg.RegionName, reg.RegionID, reg.RegionCoordX, reg.RegionCoordY);
+        }
+
         public bool DeregisterRegion(UUID regionID)
         {
             RegionData region = m_Database.Get(regionID, UUID.Zero);
@@ -360,7 +508,11 @@ namespace OpenSim.Services.GridService
             if (region != null)
             {
                 // Not really? Maybe?
+<<<<<<< HEAD
+                // The adjacent regions are presumed to be the same size as the current region
+=======
 /* this fails wiht var regions. My_sql db should now handle var regions
+>>>>>>> avn/ubitvar
                 List<RegionData> rdatas = m_Database.Get(
                     region.posX - region.sizeX - 1, region.posY - region.sizeY - 1, 
                     region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID);
@@ -380,7 +532,11 @@ namespace OpenSim.Services.GridService
                     }
                 }
 
-//                m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
+                // string rNames = "";
+                // foreach (GridRegion gr in rinfos)
+                //     rNames += gr.RegionName + ",";
+                // m_log.DebugFormat("{0} region {1} has {2} neighbours ({3})",
+                //             LogHeader, region.RegionName, rinfos.Count, rNames);
             }
             else
             {
@@ -409,13 +565,24 @@ namespace OpenSim.Services.GridService
         
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
-            int snapX = (int)(x / Constants.RegionSize) * (int)Constants.RegionSize;
-            int snapY = (int)(y / Constants.RegionSize) * (int)Constants.RegionSize;
+            uint regionX = Util.WorldToRegionLoc((uint)x);
+            uint regionY = Util.WorldToRegionLoc((uint)y);
+            int snapX = (int)Util.RegionToWorldLoc(regionX);
+            int snapY = (int)Util.RegionToWorldLoc(regionY);
+
             RegionData rdata = m_Database.Get(snapX, snapY, scopeID);
             if (rdata != null)
+            {
+                m_log.DebugFormat("{0} GetRegionByPosition. Found region {1} in database. Pos=<{2},{3}>",
+                                 LogHeader, rdata.RegionName, regionX, regionY);
                 return RegionData2RegionInfo(rdata);
-
-            return null;
+            }
+            else
+            {
+                m_log.DebugFormat("{0} GetRegionByPosition. Did not find region in database. Pos=<{1},{2}>",
+                                 LogHeader, regionX, regionY);
+                return null;
+            }
         }
 
         public GridRegion GetRegionByName(UUID scopeID, string name)
@@ -668,6 +835,27 @@ namespace OpenSim.Services.GridService
             OutputRegionsToConsoleSummary(regions);
         }
 
+        private void HandleShowGridSize(string module, string[] cmd)
+        {
+            List<RegionData> regions = m_Database.Get(int.MinValue, int.MinValue, int.MaxValue, int.MaxValue, UUID.Zero);
+
+            double size = 0;
+
+            foreach (RegionData region in regions)
+            {
+                int flags = Convert.ToInt32(region.Data["flags"]);
+
+                if ((flags & (int)Framework.RegionFlags.Hyperlink) == 0)
+                    size += region.sizeX * region.sizeY;
+            }
+
+            MainConsole.Instance.Output("This is a very rough approximation.");
+            MainConsole.Instance.Output("Although it will not count regions that are actually links to others over the Hypergrid, ");
+            MainConsole.Instance.Output("it will count regions that are inactive but were not deregistered from the grid service");
+            MainConsole.Instance.Output("(e.g. simulator crashed rather than shutting down cleanly).\n");
+
+            MainConsole.Instance.OutputFormat("Grid size: {0} km squared.", size / 1000000);
+        }
 
         private void HandleShowRegion(string module, string[] cmd)
         {
@@ -697,20 +885,24 @@ namespace OpenSim.Services.GridService
                 return;
             }
 
-            int x, y;
-            if (!int.TryParse(cmd[3], out x))
+            uint x, y;
+            if (!uint.TryParse(cmd[3], out x))
             {
                 MainConsole.Instance.Output("x-coord must be an integer");
                 return;
             }
 
-            if (!int.TryParse(cmd[4], out y))
+            if (!uint.TryParse(cmd[4], out y))
             {
                 MainConsole.Instance.Output("y-coord must be an integer");
                 return;
             }
 
+<<<<<<< HEAD
+            RegionData region = m_Database.Get((int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y), UUID.Zero);
+=======
             RegionData region = m_Database.Get((int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y), UUID.Zero);
+>>>>>>> avn/ubitvar
             if (region == null)
             {
                 MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y);
@@ -727,7 +919,11 @@ namespace OpenSim.Services.GridService
             ConsoleDisplayList dispList = new ConsoleDisplayList();
             dispList.AddRow("Region Name", r.RegionName);
             dispList.AddRow("Region ID", r.RegionID);
+<<<<<<< HEAD
+            dispList.AddRow("Position", string.Format("{0},{1}", r.coordX, r.coordY));
+=======
             dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY));
+>>>>>>> avn/ubitvar
             dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY));
             dispList.AddRow("URI", r.Data["serverURI"]);
             dispList.AddRow("Owner ID", r.Data["owner_uuid"]);
@@ -745,10 +941,10 @@ namespace OpenSim.Services.GridService
         private void OutputRegionsToConsoleSummary(List<RegionData> regions)
         {
             ConsoleDisplayTable dispTable = new ConsoleDisplayTable();
-            dispTable.AddColumn("Name", 16);
+            dispTable.AddColumn("Name", 44);
             dispTable.AddColumn("ID", 36);
             dispTable.AddColumn("Position", 11);
-            dispTable.AddColumn("Owner ID", 36);
+            dispTable.AddColumn("Size", 11);
             dispTable.AddColumn("Flags", 60);
 
             foreach (RegionData r in regions)
@@ -758,7 +954,7 @@ namespace OpenSim.Services.GridService
                     r.RegionName,
                     r.RegionID.ToString(),
                     string.Format("{0},{1}", r.coordX, r.coordY),
-                    r.Data["owner_uuid"].ToString(),
+                    string.Format("{0}x{1}", r.sizeX, r.sizeY),
                     flags.ToString());
             }
 
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 0448b54..b4577b0 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -47,7 +47,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.GridService
 {
-    public class HypergridLinker 
+    public class HypergridLinker : IHypergridLinker
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -68,10 +68,6 @@ namespace OpenSim.Services.GridService
         protected string m_ThisGatekeeper = string.Empty;
         protected Uri m_ThisGatekeeperURI = null;
 
-        // Hyperlink regions are hyperlinks on the map
-        public readonly Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>();
-        protected Dictionary<UUID, ulong> m_HyperlinkHandles = new Dictionary<UUID, ulong>();
-
         protected GridRegion m_DefaultRegion;
         protected GridRegion DefaultRegion
         {
@@ -160,18 +156,18 @@ namespace OpenSim.Services.GridService
 
             if (MainConsole.Instance != null)
             {
-                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region",
+                MainConsole.Instance.Commands.AddCommand("Hypergrid", false, "link-region",
                     "link-region <Xloc> <Yloc> <ServerURI> [<RemoteRegionName>]",
                     "Link a HyperGrid Region. Examples for <ServerURI>: http://grid.net:8002/ or http://example.org/path/foo.php", RunCommand);
-                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region",
+                MainConsole.Instance.Commands.AddCommand("Hypergrid", false, "link-region",
                     "link-region <Xloc> <Yloc> <RegionIP> <RegionPort> [<RemoteRegionName>]",
                     "Link a hypergrid region (deprecated)", RunCommand);
-                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region",
+                MainConsole.Instance.Commands.AddCommand("Hypergrid", false, "unlink-region",
                     "unlink-region <local name>",
                     "Unlink a hypergrid region", RunCommand);
-                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>]",
+                MainConsole.Instance.Commands.AddCommand("Hypergrid", false, "link-mapping", "link-mapping [<x> <y>]",
                     "Set local coordinate to map HG regions to", RunCommand);
-                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks",
+                MainConsole.Instance.Commands.AddCommand("Hypergrid", false, "show hyperlinks", "show hyperlinks",
                     "List the HG regions", HandleShow);
             }
         }
@@ -190,7 +186,7 @@ namespace OpenSim.Services.GridService
         private static Random random = new Random();
 
         // From the command line link-region (obsolete) and the map
-        public GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, out string reason)
+        private GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, out string reason)
         {
             return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason);
         }
@@ -200,24 +196,36 @@ namespace OpenSim.Services.GridService
             reason = string.Empty;
             GridRegion regInfo = null;
 
+            mapName = mapName.Trim();
+
             if (!mapName.StartsWith("http"))
             {
-                string host = "127.0.0.1";
-                string portstr;
+                // Formats: grid.example.com:8002:region name
+                //          grid.example.com:region name
+                //          grid.example.com:8002
+                //          grid.example.com
+
+                string host;
+                uint port = 80;
                 string regionName = "";
-                uint port = 0;
+                
                 string[] parts = mapName.Split(new char[] { ':' });
-                if (parts.Length >= 1)
+                
+                if (parts.Length == 0)
                 {
-                    host = parts[0];
+                    reason = "Wrong format for link-region";
+                    return null;
                 }
+                
+                host = parts[0];
+                
                 if (parts.Length >= 2)
                 {
-                    portstr = parts[1];
-                    //m_log.Debug("-- port = " + portstr);
-                    if (!UInt32.TryParse(portstr, out port))
+                    // If it's a number then assume it's a port. Otherwise, it's a region name.
+                    if (!UInt32.TryParse(parts[1], out port))
                         regionName = parts[1];
                 }
+
                 // always take the last one
                 if (parts.Length >= 3)
                 {
@@ -234,14 +242,30 @@ namespace OpenSim.Services.GridService
             }
             else
             {
-                string[] parts = mapName.Split(new char[] {' '});
-                string regionName = String.Empty;
-                if (parts.Length > 1)
+                // Formats: http://grid.example.com region name
+                //          http://grid.example.com "region name"
+                //          http://grid.example.com
+
+                string serverURI;
+                string regionName = "";
+
+                string[] parts = mapName.Split(new char[] { ' ' });
+
+                if (parts.Length == 0)
                 {
-                    regionName = mapName.Substring(parts[0].Length + 1);
-                    regionName = regionName.Trim(new char[] {'"'});
+                    reason = "Wrong format for link-region";
+                    return null;
                 }
-                if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason))
+
+                serverURI = parts[0];
+
+                if (parts.Length >= 2)
+                {
+                    regionName = mapName.Substring(serverURI.Length);
+                    regionName = regionName.Trim(new char[] { '"', ' ' });
+                }
+
+                if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, serverURI, ownerID, out regInfo, out reason))
                 {
                     regInfo.RegionName = mapName; 
                     return regInfo;
@@ -250,15 +274,23 @@ namespace OpenSim.Services.GridService
 
             return null;
         }
-                
-        public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, UUID ownerID, out GridRegion regInfo, out string reason)
+
+        private bool TryCreateLink(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, UUID ownerID, out GridRegion regInfo, out string reason)
         {
             return TryCreateLink(scopeID, xloc, yloc, remoteRegionName, externalPort, externalHostName, null, ownerID, out regInfo, out reason);
         }
-        
-        public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason)
+
+        private bool TryCreateLink(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason)
+        {
+            lock (this)
+            {
+                return TryCreateLinkImpl(scopeID, xloc, yloc, remoteRegionName, externalPort, externalHostName, serverURI, ownerID, out regInfo, out reason);
+            }
+        }
+
+        private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason)
         {
-            m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0} {1}, in {2}-{3}", 
+            m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>", 
                 ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI),
                 remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc));
 
@@ -266,15 +298,15 @@ namespace OpenSim.Services.GridService
             Uri uri = null;
 
             regInfo = new GridRegion();
-            if ( externalPort > 0)
+            if (externalPort > 0)
                 regInfo.HttpPort = externalPort;
             else
-                regInfo.HttpPort = 0;
-            if ( externalHostName != null)
+                regInfo.HttpPort = 80;
+            if (externalHostName != null)
                 regInfo.ExternalHostName = externalHostName;
             else
                 regInfo.ExternalHostName = "0.0.0.0";
-            if ( serverURI != null)
+            if (serverURI != null)
             {
                 regInfo.ServerURI = serverURI;
                 try
@@ -286,7 +318,7 @@ namespace OpenSim.Services.GridService
                 catch {}
             }
 
-            if ( remoteRegionName != string.Empty )
+            if (remoteRegionName != string.Empty)
                 regInfo.RegionName = remoteRegionName;
                 
             regInfo.RegionLocX = xloc;
@@ -299,6 +331,7 @@ namespace OpenSim.Services.GridService
             {
                 if (regInfo.ExternalHostName == m_ThisGatekeeperURI.Host && regInfo.HttpPort == m_ThisGatekeeperURI.Port)
                 {
+                    m_log.InfoFormat("[HYPERGRID LINKER]: Cannot hyperlink to regions on the same grid");
                     reason = "Cannot hyperlink to regions on the same grid";
                     return false;
                 }
@@ -310,7 +343,11 @@ namespace OpenSim.Services.GridService
             GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY);
             if (region != null)
             {
+<<<<<<< HEAD
+                m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates <{0},{1}> are already occupied by region {2} with uuid {3}",
+=======
                 m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates {0}-{1} are already occupied by region {2} with uuid {3}",
+>>>>>>> avn/ubitvar
                     Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY),
                     region.RegionName, region.RegionID);
                 reason = "Coordinates are already in use";
@@ -346,8 +383,13 @@ namespace OpenSim.Services.GridService
             region = m_GridService.GetRegionByUUID(scopeID, regionID);
             if (region != null)
             {
+<<<<<<< HEAD
+                m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates <{0},{1}>",
+                    Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY));
+=======
                 m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates {0} {1}",
                     Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY));
+>>>>>>> avn/ubitvar
                 regInfo = region;
                 return true;
             }
@@ -381,7 +423,8 @@ namespace OpenSim.Services.GridService
             regInfo.RegionSecret = handle.ToString();
 
             AddHyperlinkRegion(regInfo, handle);
-            m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage);
+            m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} at <{1},{2}> with image {3}",
+                regInfo.RegionName, Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY), regInfo.TerrainImage);
             return true;
         }
 
@@ -502,10 +545,21 @@ namespace OpenSim.Services.GridService
             MainConsole.Instance.Output(new string('-', 72));
             foreach (RegionData r in regions)
             {
+<<<<<<< HEAD
+                MainConsole.Instance.Output(
+                    String.Format("{0}\n{2,-32} {1}\n",
+                        r.RegionName, r.RegionID, 
+                        String.Format("{0},{1} ({2},{3})", r.posX, r.posY,
+                                    Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY)
+                        )
+                    )
+                );
+=======
                 MainConsole.Instance.Output(String.Format("{0}\n{2,-32} {1}\n",
                                     r.RegionName, r.RegionID,
                                     String.Format("{0},{1} ({2},{3})", r.posX, r.posY,
                                         Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY))) );
+>>>>>>> avn/ubitvar
             }
             return;
         }
@@ -607,8 +661,13 @@ namespace OpenSim.Services.GridService
                     string externalHostName;
                     try
                     {
+<<<<<<< HEAD
+                        xloc = Convert.ToUInt32(cmdparams[0]);
+                        yloc = Convert.ToUInt32(cmdparams[1]);
+=======
                         xloc = (uint)Convert.ToInt32(cmdparams[0]);
                         yloc = (uint)Convert.ToInt32(cmdparams[1]);
+>>>>>>> avn/ubitvar
                         externalPort = Convert.ToUInt32(cmdparams[3]);
                         externalHostName = cmdparams[2];
                         //internalPort = Convert.ToUInt32(cmdparams[4]);
@@ -711,8 +770,13 @@ namespace OpenSim.Services.GridService
             string externalHostName;
             uint realXLoc, realYLoc;
 
+<<<<<<< HEAD
+            xloc = Convert.ToUInt32(config.GetString("xloc", "0"));
+            yloc = Convert.ToUInt32(config.GetString("yloc", "0"));
+=======
             xloc = (uint)Convert.ToInt32(config.GetString("xloc", "0"));
             yloc = (uint)Convert.ToInt32(config.GetString("yloc", "0"));
+>>>>>>> avn/ubitvar
             externalPort = Convert.ToUInt32(config.GetString("externalPort", "0"));
             externalHostName = config.GetString("externalHostName", "");
             realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0"));
@@ -720,8 +784,13 @@ namespace OpenSim.Services.GridService
 
             if (m_enableAutoMapping)
             {
+<<<<<<< HEAD
+                xloc = (xloc % 100) + m_autoMappingX;
+                yloc = (yloc % 100) + m_autoMappingY;
+=======
                 xloc = (uint)((xloc % 100) + m_autoMappingX);
                 yloc = (uint)((yloc % 100) + m_autoMappingY);
+>>>>>>> avn/ubitvar
             }
 
             if (((realXLoc == 0) && (realYLoc == 0)) ||
diff --git a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
index bd84123..ebe3c44 100644
--- a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index f6136b5..44b26d5 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -204,29 +204,63 @@ namespace OpenSim.Services.HypergridService
             return true;
         }
 
-        public GridRegion GetHyperlinkRegion(UUID regionID)
+        public GridRegion GetHyperlinkRegion(UUID regionID, UUID agentID, string agentHomeURI, out string message)
         {
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to get hyperlink region {0}", regionID);
+            message = null;
 
             if (!m_AllowTeleportsToAnyRegion)
+            {
                 // Don't even check the given regionID
+                m_log.DebugFormat(
+                    "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", 
+                    m_DefaultGatewayRegion.RegionName, 
+                    m_DefaultGatewayRegion.RegionID,
+                    m_DefaultGatewayRegion.ServerURI,
+                    agentID, 
+                    agentHomeURI == null ? "" : " @ " + agentHomeURI);
+
+                message = "Teleporting to the default region.";
                 return m_DefaultGatewayRegion;
+            }
 
             GridRegion region = m_GridService.GetRegionByUUID(m_ScopeID, regionID);
+
+            if (region == null)
+            {
+                m_log.DebugFormat(
+                    "[GATEKEEPER SERVICE]: Could not find region with ID {0} as requested by user {1}{2}.  Returning null.",
+                    regionID, agentID, (agentHomeURI == null) ? "" : " @ " + agentHomeURI);
+
+                message = "The teleport destination could not be found.";
+                return null;
+            }
+
+            m_log.DebugFormat(
+                "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.",
+                region.RegionName, 
+                region.RegionID,
+                region.ServerURI,
+                agentID, 
+                agentHomeURI == null ? "" : " @ " + agentHomeURI);
+
             return region;
         }
 
         #region Login Agent
-        public bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason)
+        public bool LoginAgent(GridRegion source, AgentCircuitData aCircuit, GridRegion destination, out string reason)
         {
             reason = string.Empty;
 
             string authURL = string.Empty;
             if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
                 authURL = aCircuit.ServiceURLs["HomeURI"].ToString();
-            m_log.InfoFormat("[GATEKEEPER SERVICE]: Login request for {0} {1} @ {2} ({3}) at {4} using viewer {5}, channel {6}, IP {7}, Mac {8}, Id0 {9} Teleport Flags {10}",
-                aCircuit.firstname, aCircuit.lastname, authURL, aCircuit.AgentID, destination.RegionName,
-                aCircuit.Viewer, aCircuit.Channel, aCircuit.IPAddress, aCircuit.Mac, aCircuit.Id0, aCircuit.teleportFlags.ToString());
+
+            m_log.InfoFormat("[GATEKEEPER SERVICE]: Login request for {0} {1} @ {2} ({3}) at {4} using viewer {5}, channel {6}, IP {7}, Mac {8}, Id0 {9}, Teleport Flags: {10}. From region {11}",
+                aCircuit.firstname, aCircuit.lastname, authURL, aCircuit.AgentID, destination.RegionID,
+                aCircuit.Viewer, aCircuit.Channel, aCircuit.IPAddress, aCircuit.Mac, aCircuit.Id0, (TeleportFlags)aCircuit.teleportFlags,
+                (source == null) ? "Unknown" : string.Format("{0} ({1}){2}", source.RegionName, source.RegionID, (source.RawServerURI == null) ? "" : " @ " + source.ServerURI));
+
+            string curViewer = Util.GetViewerName(aCircuit);
 
             //
             // Check client
@@ -234,11 +268,11 @@ namespace OpenSim.Services.HypergridService
             if (m_AllowedClients != string.Empty)
             {
                 Regex arx = new Regex(m_AllowedClients);
-                Match am = arx.Match(aCircuit.Viewer);
+                Match am = arx.Match(curViewer);
 
                 if (!am.Success)
                 {
-                    m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client {0} is not allowed", aCircuit.Viewer);
+                    m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client {0} is not allowed", curViewer);
                     return false;
                 }
             }
@@ -246,11 +280,11 @@ namespace OpenSim.Services.HypergridService
             if (m_DeniedClients != string.Empty)
             {
                 Regex drx = new Regex(m_DeniedClients);
-                Match dm = drx.Match(aCircuit.Viewer);
+                Match dm = drx.Match(curViewer);
 
                 if (dm.Success)
                 {
-                    m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client {0} is denied", aCircuit.Viewer);
+                    m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client {0} is denied", curViewer);
                     return false;
                 }
             }
@@ -396,7 +430,7 @@ namespace OpenSim.Services.HypergridService
                 try
                 {
                     Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString());
-                    aCircuit.lastname = "@" + uri.Host; // + ":" + uri.Port;
+                    aCircuit.lastname = "@" + uri.Authority;
                 }
                 catch
                 {
@@ -413,9 +447,16 @@ namespace OpenSim.Services.HypergridService
             // Preserve our TeleportFlags we have gathered so-far
             loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags;
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0}, Teleport Flags: {1}", aCircuit.Name, loginFlag);
+
+            string version;
+
+            if (!m_SimulationService.QueryAccess(
+                destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), 
+                true, aCircuit.startpos, "SIMULATION/0.3", new List<UUID>(), out version, out reason))
+                return false;
 
-            return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
+            return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason);
         }
 
         protected bool Authenticate(AgentCircuitData aCircuit)
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index 84dec8d..b83fb1e 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Services.HypergridService
             if (m_UserAccountService == null)
                 throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
 
-            // legacy configuration [obsolete]
-            m_HomeURL = assetConfig.GetString("ProfileServerURI", string.Empty);
-            // Preferred
-            m_HomeURL = assetConfig.GetString("HomeURI", m_HomeURL);
+            m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
+                new string[] { "Startup", "Hypergrid", configName }, string.Empty);
+            if (m_HomeURL == string.Empty)
+                throw new Exception("[HGAssetService] No HomeURI specified");
 
             m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
 
@@ -100,7 +100,7 @@ namespace OpenSim.Services.HypergridService
                 return null;
 
             if (asset.Metadata.Type == (sbyte)AssetType.Object)
-                asset.Data = AdjustIdentifiers(asset.Data); ;
+                asset.Data = AdjustIdentifiers(asset.Data);
 
             AdjustIdentifiers(asset.Metadata);
 
@@ -129,6 +129,14 @@ namespace OpenSim.Services.HypergridService
             if (!m_AssetPerms.AllowedExport(asset.Type))
                 return null;
 
+            // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+            // Fix bad assets before sending them elsewhere
+            if (asset.Type == (int)AssetType.Object && asset.Data != null)
+            {
+                string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+                asset.Data = Utils.StringToBytes(xml);
+            }
+
             return asset.Data;
         }
 
@@ -139,6 +147,14 @@ namespace OpenSim.Services.HypergridService
             if (!m_AssetPerms.AllowedImport(asset.Type))
                 return string.Empty;
 
+            // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+            // Fix bad assets before storing on this server
+            if (asset.Type == (int)AssetType.Object && asset.Data != null)
+            {
+                string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+                asset.Data = Utils.StringToBytes(xml);
+            }
+
             return base.Store(asset);
         }
 
@@ -160,10 +176,16 @@ namespace OpenSim.Services.HypergridService
                 meta.CreatorID = meta.CreatorID + ";" + m_HomeURL + "/" + creator.FirstName + " " + creator.LastName;
         }
 
+        // Only for Object
         protected byte[] AdjustIdentifiers(byte[] data)
         {
             string xml = Utils.BytesToString(data);
-            return Utils.StringToBytes(ExternalRepresentationUtils.RewriteSOP(xml, m_HomeURL, m_Cache, UUID.Zero));
+
+            // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+            // Fix bad assets before sending them elsewhere
+            xml = ExternalRepresentationUtils.SanitizeXml(xml);
+
+            return Utils.StringToBytes(ExternalRepresentationUtils.RewriteSOP(xml, "HGAssetService", m_HomeURL, m_Cache, UUID.Zero));
         }
 
     }
diff --git a/OpenSim/Services/HypergridService/HGFSAssetService.cs b/OpenSim/Services/HypergridService/HGFSAssetService.cs
new file mode 100644
index 0000000..54e8ccb
--- /dev/null
+++ b/OpenSim/Services/HypergridService/HGFSAssetService.cs
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Reflection;
+
+using Nini.Config;
+using log4net;
+using OpenMetaverse;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.FSAssetService;
+
+namespace OpenSim.Services.HypergridService
+{
+    /// <summary>
+    /// Hypergrid asset service. It serves the IAssetService interface,
+    /// but implements it in ways that are appropriate for inter-grid
+    /// asset exchanges. This version is for FSAssets.
+    /// </summary>
+    public class HGFSAssetService : FSAssetConnector, IAssetService
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(
+            MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_HomeURL;
+        private IUserAccountService m_UserAccountService;
+
+        private UserAccountCache m_Cache;
+
+        private AssetPermissions m_AssetPerms;
+
+        public HGFSAssetService(IConfigSource config, string configName) : base(config, "AssetService")
+        {
+            m_log.Debug("[HGAsset Service]: Starting in FSAsset mode");
+            IConfig assetConfig = config.Configs[configName];
+            if (assetConfig == null)
+                throw new Exception("No HGAssetService configuration");
+
+            string userAccountsDll = assetConfig.GetString("UserAccountsService", string.Empty);
+            if (userAccountsDll == string.Empty)
+                throw new Exception("Please specify UserAccountsService in HGAssetService configuration");
+
+            Object[] args = new Object[] { config };
+            m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountsDll, args);
+            if (m_UserAccountService == null)
+                throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
+
+            m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
+                new string[] { "Startup", "Hypergrid", configName }, string.Empty);
+            if (m_HomeURL == string.Empty)
+                throw new Exception("[HGAssetService] No HomeURI specified");
+
+            m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
+
+            // Permissions
+            m_AssetPerms = new AssetPermissions(assetConfig);
+        }
+
+        #region IAssetService overrides
+        public override AssetBase Get(string id)
+        {
+            AssetBase asset = base.Get(id);
+
+            if (asset == null)
+                return null;
+
+            if (!m_AssetPerms.AllowedExport(asset.Type))
+                return null;
+
+            if (asset.Metadata.Type == (sbyte)AssetType.Object)
+                asset.Data = AdjustIdentifiers(asset.Data);
+
+            AdjustIdentifiers(asset.Metadata);
+
+            return asset;
+        }
+
+        public override AssetMetadata GetMetadata(string id)
+        {
+            AssetMetadata meta = base.GetMetadata(id);
+
+            if (meta == null)
+                return null;
+
+            AdjustIdentifiers(meta);
+
+            return meta;
+        }
+
+        public override byte[] GetData(string id)
+        {
+            AssetBase asset = Get(id);
+
+            if (asset == null)
+                return null;
+
+            if (!m_AssetPerms.AllowedExport(asset.Type))
+                return null;
+
+            // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+            // Fix bad assets before sending them elsewhere
+            if (asset.Type == (int)AssetType.Object && asset.Data != null)
+            {
+                string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+                asset.Data = Utils.StringToBytes(xml);
+            }
+
+            return asset.Data;
+        }
+
+        //public virtual bool Get(string id, Object sender, AssetRetrieved handler)
+
+        public override string Store(AssetBase asset)
+        {
+            if (!m_AssetPerms.AllowedImport(asset.Type))
+                return string.Empty;
+
+            // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+            // Fix bad assets before storing on this server
+            if (asset.Type == (int)AssetType.Object && asset.Data != null)
+            {
+                string xml = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(asset.Data));
+                asset.Data = Utils.StringToBytes(xml);
+            }
+
+            return base.Store(asset);
+        }
+
+        public override bool Delete(string id)
+        {
+            // NOGO
+            return false;
+        }
+
+        #endregion 
+
+        protected void AdjustIdentifiers(AssetMetadata meta)
+        {
+            if (meta == null || m_Cache == null)
+                return;
+
+            UserAccount creator = m_Cache.GetUser(meta.CreatorID);
+            if (creator != null)
+                meta.CreatorID = meta.CreatorID + ";" + m_HomeURL + "/" + creator.FirstName + " " + creator.LastName;
+        }
+
+        // Only for Object
+        protected byte[] AdjustIdentifiers(byte[] data)
+        {
+            string xml = Utils.BytesToString(data);
+
+            // Deal with bug introduced in Oct. 20 (1eb3e6cc43e2a7b4053bc1185c7c88e22356c5e8)
+            // Fix bad assets before sending them elsewhere
+            xml = ExternalRepresentationUtils.SanitizeXml(xml);
+
+            return Utils.StringToBytes(ExternalRepresentationUtils.RewriteSOP(xml, "HGAssetService", m_HomeURL, m_Cache, UUID.Zero));
+        }
+
+    }
+
+}
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs
index a8bcfb2..6e35a88 100644
--- a/OpenSim/Services/HypergridService/HGFriendsService.cs
+++ b/OpenSim/Services/HypergridService/HGFriendsService.cs
@@ -198,7 +198,8 @@ namespace OpenSim.Services.HypergridService
             // So let's send back the call, but start a thread to continue
             // with the verification and the actual action.
 
-            Util.FireAndForget(delegate { ProcessFriendshipOffered(fromID, fromName, toID, message); });
+            Util.FireAndForget(
+                o => ProcessFriendshipOffered(fromID, fromName, toID, message), null, "HGFriendsService.ProcessFriendshipOffered");
 
             return true;
         }
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
index e8d7cca..32ca09a 100644
--- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs
+++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
@@ -101,7 +101,14 @@ namespace OpenSim.Services.HypergridService
                 Object[] args = new Object[] { config };
                 m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
                 m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
-                m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(userAgentService, args);
+                try
+                {
+                    m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(userAgentService, args);
+                }
+                catch
+                {
+                    m_log.WarnFormat("[HG IM SERVICE]: Unable to create User Agent Service. Missing config var  in [HGInstantMessageService]?");
+                }
 
                 m_RegionCache = new ExpiringCache<UUID, GridRegion>();
 
@@ -215,7 +222,15 @@ namespace OpenSim.Services.HypergridService
                 {
                     // Let's check with the UAS if the user is elsewhere
                     m_log.DebugFormat("[HG IM SERVICE]: User is not present. Checking location with User Agent service");
-                    url = m_UserAgentService.LocateUser(toAgentID);
+                    try
+                    {
+                        url = m_UserAgentService.LocateUser(toAgentID);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Warn("[HG IM SERVICE]: LocateUser call failed ", e);
+                        url = string.Empty;
+                    }
                 }
 
                 // check if we've tried this before..
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index 3233caf..9158b41 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -103,12 +103,6 @@ namespace OpenSim.Services.HypergridService
             return new List<InventoryFolderBase>();
         }
 
-        public override InventoryCollection GetUserInventory(UUID userID)
-        {
-            // NOGO for this inventory service
-            return null;
-        }
-
         public override InventoryFolderBase GetRootFolder(UUID principalID)
         {
             //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetRootFolder for {0}", principalID);
@@ -121,7 +115,7 @@ namespace OpenSim.Services.HypergridService
                 return ConvertToOpenSim(folders[0]);
             
             // make one
-            XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)AssetType.Folder, "My Suitcase");
+            XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase");
             return ConvertToOpenSim(suitcase);
         }
 
@@ -147,7 +141,7 @@ namespace OpenSim.Services.HypergridService
         //}
 
 
-        public override InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
+        public override InventoryFolderBase GetFolderForType(UUID principalID, FolderType type)
         {
             //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type);
             return GetRootFolder(principalID);
@@ -159,7 +153,14 @@ namespace OpenSim.Services.HypergridService
         //public InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
         //{
         //}
-     
+
+        // NOGO
+        //
+        public override InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderID)
+        {
+            return new InventoryCollection[0];
+        }
+        
         //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
         //{
         //}
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 835cde3..40eb6d4 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Services.HypergridService
             }
 
             List<XInventoryFolder> tree = GetFolderTree(principalID, suitcase.folderID);
-            if (tree == null || (tree != null && tree.Count == 0))
+            if (tree.Count == 0)
                 return null;
 
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
@@ -137,59 +137,6 @@ namespace OpenSim.Services.HypergridService
             return folders;
         }
 
-        public override InventoryCollection GetUserInventory(UUID userID)
-        {
-            m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Get Suitcase inventory for user {0}", userID);
-
-            InventoryCollection userInventory = new InventoryCollection();
-            userInventory.UserID = userID;
-            userInventory.Folders = new List<InventoryFolderBase>();
-            userInventory.Items = new List<InventoryItemBase>();
-
-            XInventoryFolder suitcase = GetSuitcaseXFolder(userID);
-
-            if (suitcase == null)
-            {
-                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Found no suitcase folder for user {0} when looking for user inventory", userID);
-                return null;
-            }
-
-            List<XInventoryFolder> tree = GetFolderTree(userID, suitcase.folderID);
-            if (tree == null || (tree != null && tree.Count == 0))
-            {
-                SetAsNormalFolder(suitcase);
-                userInventory.Folders.Add(ConvertToOpenSim(suitcase));
-                return userInventory;
-            }
-
-            List<InventoryItemBase> items;
-            foreach (XInventoryFolder f in tree)
-            {
-                // Add the items of this subfolder
-                items = GetFolderItems(userID, f.folderID);
-                if (items != null && items.Count > 0)
-                {
-                    userInventory.Items.AddRange(items);
-                }
-
-                // Add the folder itself
-                userInventory.Folders.Add(ConvertToOpenSim(f));
-            }
-
-            items = GetFolderItems(userID, suitcase.folderID);
-            if (items != null && items.Count > 0)
-            {
-                userInventory.Items.AddRange(items);
-            }
-
-            SetAsNormalFolder(suitcase);
-            userInventory.Folders.Add(ConvertToOpenSim(suitcase));
-
-            m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetUserInventory for user {0} returning {1} folders and {2} items",
-                userID, userInventory.Folders.Count, userInventory.Items.Count);
-            return userInventory;
-        }
-
         public override InventoryFolderBase GetRootFolder(UUID principalID)
         {
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetRootFolder for {0}", principalID);
@@ -209,27 +156,21 @@ namespace OpenSim.Services.HypergridService
             if (suitcase == null)
             {
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: User {0} does not have a Suitcase folder. Creating it...", principalID);
-                // make one, and let's add it to the user's inventory as a direct child of the root folder
-                // In the DB we tag it as type 100, but we use -1 (Unknown) outside
-                suitcase = CreateFolder(principalID, root.folderID, 100, "My Suitcase");
+                // Create the My Suitcase folder under the user's root folder.
+                // In the DB we tag it as type 100, but we use type 8 (Folder) outside, as this affects the sort order.
+                suitcase = CreateFolder(principalID, root.folderID, (int)FolderType.Suitcase, InventoryFolderBase.SUITCASE_FOLDER_NAME);
                 if (suitcase == null)
                 {
                     m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder");
+                    return null;
                 }
-                else
-                {
-                    m_Database.StoreFolder(suitcase);
-
-                    // Create System folders
-                    CreateSystemFolders(principalID, suitcase.folderID);
 
-                    SetAsNormalFolder(suitcase);
-
-                    return ConvertToOpenSim(suitcase);
-                }
+                CreateSystemFolders(principalID, suitcase.folderID);
             }
 
-            return null;
+            SetAsNormalFolder(suitcase);
+
+            return ConvertToOpenSim(suitcase);
         }
 
         protected void CreateSystemFolders(UUID principalID, UUID rootID)
@@ -237,42 +178,41 @@ namespace OpenSim.Services.HypergridService
             m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Creating System folders under Suitcase...");
             XInventoryFolder[] sysFolders = GetSystemFolders(principalID, rootID);
 
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Animation) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Animation, "Animations");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Bodypart) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Bodypart, "Body Parts");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.CallingCard) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.CallingCard, "Calling Cards");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Clothing) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Clothing, "Clothing");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Gesture) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Gesture, "Gestures");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Landmark) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Landmark, "Landmarks");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.LostAndFoundFolder) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.LostAndFoundFolder, "Lost And Found");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Notecard) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Notecard, "Notecards");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Object) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Object, "Objects");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.SnapshotFolder) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.SnapshotFolder, "Photo Album");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.LSLText) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.LSLText, "Scripts");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Sound) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Sound, "Sounds");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.Texture) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.Texture, "Textures");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.TrashFolder) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.TrashFolder, "Trash");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.FavoriteFolder) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.FavoriteFolder, "Favorites");
-            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)AssetType.CurrentOutfitFolder) return true; return false; }))
-                CreateFolder(principalID, rootID, (int)AssetType.CurrentOutfitFolder, "Current Outfit");
-
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Animation) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Animation, "Animations");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.BodyPart) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.BodyPart, "Body Parts");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.CallingCard) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.CallingCard, "Calling Cards");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Clothing) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Clothing, "Clothing");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.CurrentOutfit) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.CurrentOutfit, "Current Outfit");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Favorites) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Favorites, "Favorites");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Gesture) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Gesture, "Gestures");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Landmark) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Landmark, "Landmarks");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.LostAndFound) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.LostAndFound, "Lost And Found");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Notecard) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Notecard, "Notecards");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Object) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Object, "Objects");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Snapshot) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Snapshot, "Photo Album");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.LSLText) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.LSLText, "Scripts");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Sound) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Sound, "Sounds");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Texture) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Texture, "Textures");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Trash) return true; return false; }))
+                CreateFolder(principalID, rootID, (int)FolderType.Trash, "Trash");
         }
 
-        public override InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
+        public override InventoryFolderBase GetFolderForType(UUID principalID, FolderType type)
         {
             //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type);
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
@@ -305,7 +245,10 @@ namespace OpenSim.Services.HypergridService
             InventoryCollection coll = null;
 
             if (!IsWithinSuitcaseTree(principalID, folderID))
+            {
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderContent: folder {0} (user {1}) is not within Suitcase tree", folderID, principalID);
                 return new InventoryCollection();
+            }
 
             coll = base.GetFolderContent(principalID, folderID);
 
@@ -322,7 +265,10 @@ namespace OpenSim.Services.HypergridService
             // Let's do a bit of sanity checking, more than the base service does
             // make sure the given folder exists under the suitcase tree of this user
             if (!IsWithinSuitcaseTree(principalID, folderID))
+            {
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderItems: folder {0} (user {1}) is not within Suitcase tree", folderID, principalID);
                 return new List<InventoryItemBase>();
+            }
 
             return base.GetFolderItems(principalID, folderID);
         }
@@ -334,7 +280,10 @@ namespace OpenSim.Services.HypergridService
             // make sure the given folder's parent folder exists under the suitcase tree of this user
 
             if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID))
+            {
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner);
                 return false;
+            }
 
             // OK, it's legit
             if (base.AddFolder(folder))
@@ -354,7 +303,7 @@ namespace OpenSim.Services.HypergridService
             //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version);
             if (!IsWithinSuitcaseTree(folder.Owner, folder.ID))
             {
-                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: folder {0} not within Suitcase tree", folder.Name);
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: UpdateFolder: folder {0}/{1} (user {2}) is not within Suitcase tree", folder.Name, folder.ID, folder.Owner);
                 return false;
             }
 
@@ -364,9 +313,17 @@ namespace OpenSim.Services.HypergridService
 
         public override bool MoveFolder(InventoryFolderBase folder)
         {
-            if (!IsWithinSuitcaseTree(folder.Owner, folder.ID) || 
-                !IsWithinSuitcaseTree(folder.Owner, folder.ParentID))
+            if (!IsWithinSuitcaseTree(folder.Owner, folder.ID))
+            {
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ID, folder.Owner);
                 return false;
+            }
+            
+            if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID))
+            {
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner);
+                return false;
+            }
 
             return base.MoveFolder(folder);
         }
@@ -388,7 +345,10 @@ namespace OpenSim.Services.HypergridService
             // Let's do a bit of sanity checking, more than the base service does
             // make sure the given folder's parent folder exists under the suitcase tree of this user
             if (!IsWithinSuitcaseTree(item.Owner, item.Folder))
+            {
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: AddItem: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner);
                 return false;
+            }
 
             // OK, it's legit
             return base.AddItem(item);
@@ -398,7 +358,10 @@ namespace OpenSim.Services.HypergridService
         public override bool UpdateItem(InventoryItemBase item)
         {
             if (!IsWithinSuitcaseTree(item.Owner, item.Folder))
+            {
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: UpdateItem: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner);
                 return false;
+            }
 
             return base.UpdateItem(item);
         }
@@ -407,11 +370,28 @@ namespace OpenSim.Services.HypergridService
         {
             // Principal is b0rked. *sigh*
 
-            if (!IsWithinSuitcaseTree(items[0].Owner, items[0].Folder))
-                return false;
+            // Check the items' destination folders
+            foreach (InventoryItemBase item in items)
+            {
+                if (!IsWithinSuitcaseTree(item.Owner, item.Folder))
+                {
+                    m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveItems: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner);
+                    return false;
+                }
+            }
 
-            return base.MoveItems(principalID, items);
+            // Check the items' current folders
+            foreach (InventoryItemBase item in items)
+            {
+                InventoryItemBase originalItem = base.GetItem(item);
+                if (!IsWithinSuitcaseTree(originalItem.Owner, originalItem.Folder))
+                {
+                    m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveItems: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner);
+                    return false;
+                }
+            }
 
+            return base.MoveItems(principalID, items);
         }
 
         public override bool DeleteItems(UUID principalID, List<UUID> itemIDs)
@@ -431,8 +411,8 @@ namespace OpenSim.Services.HypergridService
 
             if (!IsWithinSuitcaseTree(it.Owner, it.Folder) && !IsPartOfAppearance(it.Owner, it.ID))
             {
-                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Item {0} (folder {1}) is not within Suitcase",
-                    it.Name, it.Folder);
+                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetItem: item {0}/{1} (folder {2}) (user {3}) is not within Suitcase tree or Appearance",
+                    it.Name, it.ID, it.Folder, it.Owner);
                 return null;
             }
 
@@ -453,7 +433,11 @@ namespace OpenSim.Services.HypergridService
             if (f != null)
             {
                 if (!IsWithinSuitcaseTree(f.Owner, f.ID))
+                {
+                    m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolder: folder {0}/{1} (user {2}) is not within Suitcase tree",
+                        f.Name, f.ID, f.Owner);
                     return null;
+                }
             }
 
             return f;
@@ -484,7 +468,7 @@ namespace OpenSim.Services.HypergridService
         {
             XInventoryFolder[] folders = m_Database.GetFolders(
                 new string[] { "agentID", "folderName", "type" },
-                new string[] { principalID.ToString(), "My Inventory", ((int)AssetType.RootFolder).ToString() });
+                new string[] { principalID.ToString(), InventoryFolderBase.ROOT_FOLDER_NAME, ((int)FolderType.Root).ToString() });
 
             if (folders != null && folders.Length > 0)
                 return folders[0];
@@ -492,7 +476,7 @@ namespace OpenSim.Services.HypergridService
             // OK, so the RootFolder type didn't work. Let's look for any type with parent UUID.Zero.
             folders = m_Database.GetFolders(
                 new string[] { "agentID", "folderName", "parentFolderID" },
-                new string[] { principalID.ToString(), "My Inventory", UUID.Zero.ToString() });
+                new string[] { principalID.ToString(), InventoryFolderBase.ROOT_FOLDER_NAME, UUID.Zero.ToString() });
 
             if (folders != null && folders.Length > 0)
                 return folders[0];
@@ -508,7 +492,7 @@ namespace OpenSim.Services.HypergridService
 
             XInventoryFolder[] folders = m_Database.GetFolders(
                     new string[] { "agentID", "type", "parentFolderID" },
-                    new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString(), root.folderID.ToString() });
+                    new string[] { userID.ToString(), ((int)FolderType.CurrentOutfit).ToString(), root.folderID.ToString() });
 
             if (folders.Length == 0)
                 return null;
@@ -521,7 +505,7 @@ namespace OpenSim.Services.HypergridService
             // Warp! Root folder for travelers
             XInventoryFolder[] folders = m_Database.GetFolders(
                     new string[] { "agentID", "type" },
-                    new string[] { principalID.ToString(), "100" }); // This is a special folder type...
+                    new string[] { principalID.ToString(), ((int)FolderType.Suitcase).ToString() }); 
 
             if (folders != null && folders.Length > 0)
                 return folders[0];
@@ -529,13 +513,13 @@ namespace OpenSim.Services.HypergridService
             // check to see if we have the old Suitcase folder
             folders = m_Database.GetFolders(
                     new string[] { "agentID", "folderName", "parentFolderID" },
-                    new string[] { principalID.ToString(), "My Suitcase", UUID.Zero.ToString() });
+                    new string[] { principalID.ToString(), InventoryFolderBase.SUITCASE_FOLDER_NAME, UUID.Zero.ToString() });
             if (folders != null && folders.Length > 0)
             {
                 // Move it to under the root folder
                 XInventoryFolder root = GetRootXFolder(principalID);
                 folders[0].parentFolderID = root.folderID;
-                folders[0].type = 100;
+                folders[0].type = (int)FolderType.Suitcase;
                 m_Database.StoreFolder(folders[0]);
                 return folders[0];
             }
@@ -545,18 +529,18 @@ namespace OpenSim.Services.HypergridService
 
         private void SetAsNormalFolder(XInventoryFolder suitcase)
         {
-            suitcase.type = (short)AssetType.Folder;
+            //suitcase.type = InventoryItemBase.SUITCASE_FOLDER_FAKE_TYPE;
         }
 
         private List<XInventoryFolder> GetFolderTree(UUID principalID, UUID folder)
         {
-            List<XInventoryFolder> t = null;
+            List<XInventoryFolder> t;
             if (m_SuitcaseTrees.TryGetValue(principalID, out t))
                 return t;
 
             // Get the tree of the suitcase folder
             t = GetFolderTreeRecursive(folder);
-            m_SuitcaseTrees.AddOrUpdate(principalID, t, 5*60); // 5minutes
+            m_SuitcaseTrees.AddOrUpdate(principalID, t, 5*60); // 5 minutes
             return t;
         }
 
@@ -567,8 +551,10 @@ namespace OpenSim.Services.HypergridService
                     new string[] { "parentFolderID" },
                     new string[] { root.ToString() });
 
-            if (folders == null || (folders != null && folders.Length == 0))
+            if (folders == null || folders.Length == 0)
+            {
                 return tree; // empty tree
+            }
             else
             {
                 foreach (XInventoryFolder f in folders)
@@ -601,17 +587,18 @@ namespace OpenSim.Services.HypergridService
             List<XInventoryFolder> tree = new List<XInventoryFolder>();
             tree.Add(suitcase); // Warp! the tree is the real root folder plus the children of the suitcase folder
             tree.AddRange(GetFolderTree(principalID, suitcase.folderID));
+
             // Also add the Current Outfit folder to the list of available folders
-            tree.Add(GetCurrentOutfitXFolder(principalID));
+            XInventoryFolder folder = GetCurrentOutfitXFolder(principalID);
+            if (folder != null)
+                tree.Add(folder);
 
             XInventoryFolder f = tree.Find(delegate(XInventoryFolder fl)
             {
-                if (fl.folderID == folderID) return true;
-                else return false;
+                return (fl.folderID == folderID);
             });
 
-            if (f == null) return false;
-            else return true;
+            return (f != null);
         }
         #endregion
 
diff --git a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
index 0fb60f6..a565729 100644
--- a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs
index e0a3e61..6c3c655 100644
--- a/OpenSim/Services/HypergridService/UserAccountCache.cs
+++ b/OpenSim/Services/HypergridService/UserAccountCache.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 
@@ -100,6 +100,11 @@ namespace OpenSim.Services.HypergridService
             return null;
         }
 
+        public void InvalidateCache(UUID userID)
+        {
+            m_UUIDCache.Remove(userID);
+        }
+
         public bool StoreUserAccount(UserAccount data)
         {
             return false;
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index b414aca..c65122a 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Services.HypergridService
         protected static string m_GridName;
 
         protected static int m_LevelOutsideContacts;
+        protected static bool m_ShowDetails;
 
         protected static bool m_BypassClientVerification;
 
@@ -128,6 +129,7 @@ namespace OpenSim.Services.HypergridService
                 m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args);
 
                 m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0);
+                m_ShowDetails = serverConfig.GetBoolean("ShowUserDetailsInHGProfile", true);
 
                 LoadTripPermissionsFromConfig(serverConfig, "ForeignTripsAllowed");
                 LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions);
@@ -215,7 +217,7 @@ namespace OpenSim.Services.HypergridService
             return home;
         }
 
-        public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason)
+        public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason)
         {
             m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", 
                 agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI);
@@ -274,13 +276,12 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}, desired region: {2}", m_GridName, gridName, region.RegionID);
 
             if (m_GridName == gridName)
-                success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason);
+            {
+                success = m_GatekeeperService.LoginAgent(source, agentCircuit, finalDestination, out reason);
+            }
             else
             {
-                success = m_GatekeeperConnector.CreateAgent(region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out myExternalIP, out reason);
-                if (success)
-                    // Report them as nowhere
-                    m_PresenceService.ReportAgent(agentCircuit.SessionID, UUID.Zero);
+                success = m_GatekeeperConnector.CreateAgent(source, region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out myExternalIP, out reason);
             }
 
             if (!success)
@@ -307,10 +308,10 @@ namespace OpenSim.Services.HypergridService
             return true;
         }
 
-        public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, out string reason)
+        public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, out string reason)
         {
             reason = string.Empty;
-            return LoginAgentToGrid(agentCircuit, gatekeeper, finalDestination, false, out reason);
+            return LoginAgentToGrid(source, agentCircuit, gatekeeper, finalDestination, false, out reason);
         }
 
         TravelingAgentInfo CreateTravelInfo(AgentCircuitData agentCircuit, GridRegion region, bool fromLogin, out TravelingAgentInfo existing)
@@ -572,10 +573,22 @@ namespace OpenSim.Services.HypergridService
 
             if (account != null)
             {
-                info.Add("user_flags", (object)account.UserFlags);
-                info.Add("user_created", (object)account.Created);
-                info.Add("user_title", (object)account.UserTitle);
+                info.Add("user_firstname", account.FirstName);
+                info.Add("user_lastname", account.LastName);
                 info.Add("result", "success");
+
+                if (m_ShowDetails)
+                {
+                    info.Add("user_flags", account.UserFlags);
+                    info.Add("user_created", account.Created);
+                    info.Add("user_title", account.UserTitle);
+                }
+                else
+                {
+                    info.Add("user_flags", 0);
+                    info.Add("user_created", 0);
+                    info.Add("user_title", string.Empty);
+                }
             }
 
             return info;
diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
new file mode 100644
index 0000000..3b4fda2
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public class AgentPrefs
+    {
+        public AgentPrefs(UUID principalID) 
+        {
+            PrincipalID = principalID;
+        }
+
+        public AgentPrefs(Dictionary<string, string> kvp)
+        {
+            if (kvp.ContainsKey("PrincipalID"))
+                UUID.TryParse(kvp["PrincipalID"], out PrincipalID);
+            if (kvp.ContainsKey("AccessPrefs"))
+                AccessPrefs = kvp["AccessPrefs"];
+            if (kvp.ContainsKey("HoverHeight"))
+                HoverHeight = double.Parse(kvp["HoverHeight"]);
+            if (kvp.ContainsKey("Language"))
+                Language = kvp["Language"];
+            if (kvp.ContainsKey("LanguageIsPublic"))
+                LanguageIsPublic = bool.Parse(kvp["LanguageIsPublic"]);
+            if (kvp.ContainsKey("PermEveryone"))
+                PermEveryone = int.Parse(kvp["PermEveryone"]);
+            if (kvp.ContainsKey("PermGroup"))
+                PermGroup = int.Parse(kvp["PermGroup"]);
+            if (kvp.ContainsKey("PermNextOwner"))
+                PermNextOwner = int.Parse(kvp["PermNextOwner"]);
+        }
+
+        public AgentPrefs(Dictionary<string, object> kvp)
+        {
+            if (kvp.ContainsKey("PrincipalID"))
+                UUID.TryParse(kvp["PrincipalID"].ToString(), out PrincipalID);
+            if (kvp.ContainsKey("AccessPrefs"))
+                AccessPrefs = kvp["AccessPrefs"].ToString();
+            if (kvp.ContainsKey("HoverHeight"))
+                HoverHeight = double.Parse(kvp["HoverHeight"].ToString());
+            if (kvp.ContainsKey("Language"))
+                Language = kvp["Language"].ToString();
+            if (kvp.ContainsKey("LanguageIsPublic"))
+                LanguageIsPublic = bool.Parse(kvp["LanguageIsPublic"].ToString());
+            if (kvp.ContainsKey("PermEveryone"))
+                PermEveryone = int.Parse(kvp["PermEveryone"].ToString());
+            if (kvp.ContainsKey("PermGroup"))
+                PermGroup = int.Parse(kvp["PermGroup"].ToString());
+            if (kvp.ContainsKey("PermNextOwner"))
+                PermNextOwner = int.Parse(kvp["PermNextOwner"].ToString());
+        }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["PrincipalID"] = PrincipalID.ToString();
+            result["AccessPrefs"] = AccessPrefs.ToString();
+            result["HoverHeight"] = HoverHeight.ToString();
+            result["Language"] = Language.ToString();
+            result["LanguageIsPublic"] = LanguageIsPublic.ToString();
+            result["PermEveryone"] = PermEveryone.ToString();
+            result["PermGroup"] = PermGroup.ToString();
+            result["PermNextOwner"] = PermNextOwner.ToString();
+            return result;
+        }
+
+        public UUID PrincipalID = UUID.Zero;
+        public string AccessPrefs = "M";
+        //public int GodLevel; // *TODO: Implement GodLevel (Unused by the viewer, afaict - 6/11/2015)
+        public double HoverHeight = 0.0;
+        public string Language = "en-us";
+        public bool LanguageIsPublic = true;
+        // DefaultObjectPermMasks
+        public int PermEveryone = 0;
+        public int PermGroup = 0;
+        public int PermNextOwner = 532480;
+    }
+
+    public interface IAgentPreferencesService
+    {
+        AgentPrefs GetAgentPreferences(UUID principalID);
+        bool StoreAgentPreferences(AgentPrefs data);
+
+        string GetLang(UUID principalID);
+    }
+}
+
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 3c469c6..28c3315 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -75,6 +75,13 @@ namespace OpenSim.Services.Interfaces
         /// </param>
         /// <returns>True if the id was parseable, false otherwise</returns>
         bool Get(string id, Object sender, AssetRetrieved handler);
+        
+        /// <summary>
+        /// Check if assets exist in the database.
+        /// </summary>
+        /// <param name="ids">The assets' IDs</param>
+        /// <returns>For each asset: true if it exists, false otherwise</returns>
+        bool[] AssetsExist(string[] ids);
 
         /// <summary>
         /// Creates a new asset
@@ -83,7 +90,7 @@ namespace OpenSim.Services.Interfaces
         /// Returns a random ID if none is passed via the asset argument.
         /// </remarks>
         /// <param name="asset"></param>
-        /// <returns></returns>
+        /// <returns>The Asset ID, or string.Empty if an error occurred</returns>
         string Store(AssetBase asset);
 
         /// <summary>
diff --git a/OpenSim/Services/Interfaces/IBakedTextureService.cs b/OpenSim/Services/Interfaces/IBakedTextureService.cs
index 8206ecd..ab88695 100644
--- a/OpenSim/Services/Interfaces/IBakedTextureService.cs
+++ b/OpenSim/Services/Interfaces/IBakedTextureService.cs
@@ -1,9 +1,39 @@
+<<<<<<< HEAD
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+=======
 ////////////////////////////////////////////////////////////////
 //
 // (c) 2009, 2010 Careminster Limited and Melanie Thielker
 //
 // All rights reserved
 //
+>>>>>>> avn/ubitvar
 using System;
 using Nini.Config;
 
diff --git a/OpenSim/Services/Interfaces/IEstateDataService.cs b/OpenSim/Services/Interfaces/IEstateDataService.cs
new file mode 100644
index 0000000..719563d
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IEstateDataService.cs
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IEstateDataService
+    {
+        /// <summary>
+        /// Load estate settings for a region.
+        /// </summary>
+        /// <param name="regionID"></param>
+        /// <param name="create">If true, then an estate is created if one is not found.</param>
+        /// <returns></returns>        
+        EstateSettings LoadEstateSettings(UUID regionID, bool create);
+        
+        /// <summary>
+        /// Load estate settings for an estate ID.
+        /// </summary>
+        /// <param name="estateID"></param>
+        /// <returns></returns>        
+        EstateSettings LoadEstateSettings(int estateID);
+
+        /// <summary>
+        /// Create a new estate.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="EstateSettings"/>
+        /// </returns>
+        EstateSettings CreateNewEstate();
+        
+        /// <summary>
+        /// Load/Get all estate settings.
+        /// </summary>
+        /// <returns>An empty list if no estates were found.</returns>
+        List<EstateSettings> LoadEstateSettingsAll();
+        
+        /// <summary>
+        /// Store estate settings.
+        /// </summary>
+        /// <remarks>
+        /// This is also called by EstateSettings.Save()</remarks>
+        /// <param name="es"></param>        
+        void StoreEstateSettings(EstateSettings es);
+        
+        /// <summary>
+        /// Get estate IDs.
+        /// </summary>
+        /// <param name="search">Name of estate to search for.  This is the exact name, no parttern matching is done.</param>
+        /// <returns></returns>        
+        List<int> GetEstates(string search);
+        
+        /// <summary>
+        /// Get the IDs of all estates owned by the given user.
+        /// </summary>
+        /// <returns>An empty list if no estates were found.</returns>
+        List<int> GetEstatesByOwner(UUID ownerID);        
+        
+        /// <summary>
+        /// Get the IDs of all estates.
+        /// </summary>
+        /// <returns>An empty list if no estates were found.</returns>
+        List<int> GetEstatesAll();
+            
+        /// <summary>
+        /// Link a region to an estate.
+        /// </summary>
+        /// <param name="regionID"></param>
+        /// <param name="estateID"></param>
+        /// <returns>true if the link succeeded, false otherwise</returns>        
+        bool LinkRegion(UUID regionID, int estateID);
+        
+        /// <summary>
+        /// Get the UUIDs of all the regions in an estate.
+        /// </summary>
+        /// <param name="estateID"></param>
+        /// <returns></returns>        
+        List<UUID> GetRegions(int estateID);
+        
+        /// <summary>
+        /// Delete an estate
+        /// </summary>
+        /// <param name="estateID"></param>
+        /// <returns>true if the delete succeeded, false otherwise</returns>        
+        bool DeleteEstate(int estateID);
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 1119e48..7e5597b 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
@@ -119,22 +120,28 @@ namespace OpenSim.Services.Interfaces
         /// <param name='scopeID'></param>
         /// <param name='regionID'></param>
         int GetRegionFlags(UUID scopeID, UUID regionID);
+
+        Dictionary<string,object> GetExtraFeatures();
+    }
+
+    public interface IHypergridLinker
+    {
+        GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, UUID ownerID, out string reason);
+        bool TryUnlinkRegion(string mapName);
     }
 
     public class GridRegion
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+#pragma warning disable 414
         private static readonly string LogHeader = "[GRID REGION]";
+#pragma warning restore 414
 
         /// <summary>
         /// The port by which http communication occurs with the region 
         /// </summary>
-        public uint HttpPort
-        {
-            get { return m_httpPort; }
-            set { m_httpPort = value; }
-        }
-        protected uint m_httpPort;
+        public uint HttpPort { get; set; }
 
         /// <summary>
         /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
@@ -142,16 +149,19 @@ namespace OpenSim.Services.Interfaces
         public string ServerURI
         {
             get { 
-                if ( m_serverURI != string.Empty ) {
+                if (!String.IsNullOrEmpty(m_serverURI)) {
                     return m_serverURI;
                 } else {
-                    if (m_httpPort == 0)
+                    if (HttpPort == 0)
                         return "http://" + m_externalHostName + "/";
                     else
-                        return "http://" + m_externalHostName + ":" + m_httpPort + "/";
+                        return "http://" + m_externalHostName + ":" + HttpPort + "/";
                 }
             }
             set { 
+<<<<<<< HEAD
+                if (value.EndsWith("/")) {
+=======
                 if ( value == null)
                 {
                     m_serverURI = String.Empty;
@@ -159,6 +169,7 @@ namespace OpenSim.Services.Interfaces
                 }
 
                 if ( value.EndsWith("/") ) {
+>>>>>>> avn/ubitvar
                     m_serverURI = value;
                 } else {
                     m_serverURI = value + '/';
@@ -167,6 +178,16 @@ namespace OpenSim.Services.Interfaces
         }
         protected string m_serverURI;
 
+        /// <summary>
+        /// Provides direct access to the 'm_serverURI' field, without returning a generated URL if m_serverURI is missing.
+        /// </summary>
+        public string RawServerURI
+        {
+            get { return m_serverURI; }
+            set { m_serverURI = value; }
+        }
+
+
         public string RegionName
         {
             get { return m_regionName; }
@@ -174,6 +195,17 @@ namespace OpenSim.Services.Interfaces
         }
         protected string m_regionName = String.Empty;
 
+        /// <summary>
+        /// Region flags.
+        /// </summary>
+        /// <remarks>
+        /// If not set (chiefly if a robust service is running code pre OpenSim 0.8.1) then this will be null and
+        /// should be ignored.  If you require flags information please use the separate IGridService.GetRegionFlags() call
+        /// XXX: This field is currently ignored when used in RegisterRegion, but could potentially be
+        /// used to set flags at this point.
+        /// </remarks>
+        public OpenSim.Framework.RegionFlags? RegionFlags { get; set; }
+
         protected string m_externalHostName;
 
         protected IPEndPoint m_internalEndPoint;
@@ -280,7 +312,7 @@ namespace OpenSim.Services.Interfaces
             RegionSizeY = (int)ConvertFrom.RegionSizeY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
-            m_httpPort = ConvertFrom.HttpPort;
+            HttpPort = ConvertFrom.HttpPort;
             RegionID = ConvertFrom.RegionID;
             ServerURI = ConvertFrom.ServerURI;
             TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
@@ -294,13 +326,14 @@ namespace OpenSim.Services.Interfaces
         public GridRegion(GridRegion ConvertFrom)
         {
             m_regionName = ConvertFrom.RegionName;
+            RegionFlags = ConvertFrom.RegionFlags;
             m_regionLocX = ConvertFrom.RegionLocX;
             m_regionLocY = ConvertFrom.RegionLocY;
             RegionSizeX = ConvertFrom.RegionSizeX;
             RegionSizeY = ConvertFrom.RegionSizeY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
-            m_httpPort = ConvertFrom.HttpPort;
+            HttpPort = ConvertFrom.HttpPort;
             RegionID = ConvertFrom.RegionID;
             ServerURI = ConvertFrom.ServerURI;
             TerrainImage = ConvertFrom.TerrainImage;
@@ -310,8 +343,112 @@ namespace OpenSim.Services.Interfaces
             RegionSecret = ConvertFrom.RegionSecret;
             EstateOwner = ConvertFrom.EstateOwner;
         }
+                
+        public GridRegion(Dictionary<string, object> kvp)
+        {
+            if (kvp.ContainsKey("uuid"))
+                RegionID = new UUID((string)kvp["uuid"]);
+
+            if (kvp.ContainsKey("locX"))
+                RegionLocX = Convert.ToInt32((string)kvp["locX"]);
+
+            if (kvp.ContainsKey("locY"))
+                RegionLocY = Convert.ToInt32((string)kvp["locY"]);
+
+            if (kvp.ContainsKey("sizeX"))
+                RegionSizeX = Convert.ToInt32((string)kvp["sizeX"]);
+            else
+                RegionSizeX = (int)Constants.RegionSize;
+
+            if (kvp.ContainsKey("sizeY"))
+                RegionSizeY = Convert.ToInt32((string)kvp["sizeY"]);
+            else
+                RegionSizeX = (int)Constants.RegionSize;
+
+            if (kvp.ContainsKey("regionName"))
+                RegionName = (string)kvp["regionName"];
+
+            if (kvp.ContainsKey("flags") && kvp["flags"] != null)
+                RegionFlags = (OpenSim.Framework.RegionFlags?)Convert.ToInt32((string)kvp["flags"]);
+
+            if (kvp.ContainsKey("serverIP"))
+            {
+                //int port = 0;
+                //Int32.TryParse((string)kvp["serverPort"], out port);
+                //IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["serverIP"]), port);
+                ExternalHostName = (string)kvp["serverIP"];
+            }
+            else
+                ExternalHostName = "127.0.0.1";
+
+            if (kvp.ContainsKey("serverPort"))
+            {
+                Int32 port = 0;
+                Int32.TryParse((string)kvp["serverPort"], out port);
+                InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
+            }
+
+            if (kvp.ContainsKey("serverHttpPort"))
+            {
+                UInt32 port = 0;
+                UInt32.TryParse((string)kvp["serverHttpPort"], out port);
+                HttpPort = port;
+            }
+
+            if (kvp.ContainsKey("serverURI"))
+                ServerURI = (string)kvp["serverURI"];
+
+            if (kvp.ContainsKey("regionMapTexture"))
+                UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
+
+            if (kvp.ContainsKey("parcelMapTexture"))
+                UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
+
+            if (kvp.ContainsKey("access"))
+                Access = Byte.Parse((string)kvp["access"]);
+
+            if (kvp.ContainsKey("regionSecret"))
+                RegionSecret =(string)kvp["regionSecret"];
+
+            if (kvp.ContainsKey("owner_uuid"))
+                EstateOwner = new UUID(kvp["owner_uuid"].ToString());
+
+            if (kvp.ContainsKey("Token"))
+                Token = kvp["Token"].ToString();
+
+            // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
+            //                         LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
+        }
+                
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> kvp = new Dictionary<string, object>();
+            kvp["uuid"] = RegionID.ToString();
+            kvp["locX"] = RegionLocX.ToString();
+            kvp["locY"] = RegionLocY.ToString();
+            kvp["sizeX"] = RegionSizeX.ToString();
+            kvp["sizeY"] = RegionSizeY.ToString();
+            kvp["regionName"] = RegionName;
+
+            if (RegionFlags != null)
+                kvp["flags"] = ((int)RegionFlags).ToString();
+
+            kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString();
+            kvp["serverHttpPort"] = HttpPort.ToString();
+            kvp["serverURI"] = ServerURI;
+            kvp["serverPort"] = InternalEndPoint.Port.ToString();
+            kvp["regionMapTexture"] = TerrainImage.ToString();
+            kvp["parcelMapTexture"] = ParcelImage.ToString();
+            kvp["access"] = Access.ToString();
+            kvp["regionSecret"] = RegionSecret;
+            kvp["owner_uuid"] = EstateOwner.ToString();
+            kvp["Token"] = Token.ToString();
+            // Maturity doesn't seem to exist in the DB
+
+            return kvp;
+        }
 
-        # region Definition of equality
+        #region Definition of equality
 
         /// <summary>
         /// Define equality as two regions having the same, non-zero UUID.
@@ -402,6 +539,8 @@ namespace OpenSim.Services.Interfaces
         {
             get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
         }
+<<<<<<< HEAD
+=======
 
         public Dictionary<string, object> ToKeyValuePairs()
         {
@@ -504,5 +643,6 @@ namespace OpenSim.Services.Interfaces
             // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
             //                         LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
         }
+>>>>>>> avn/ubitvar
     }
 }
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index 05e175a..5e012fb 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -37,25 +37,71 @@ namespace OpenSim.Services.Interfaces
     public interface IGatekeeperService
     {
         bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason);
-        GridRegion GetHyperlinkRegion(UUID regionID);
+        
+        /// <summary>
+        /// Returns the region a Hypergrid visitor should enter.
+        /// </summary>
+        /// <remarks>
+        /// Usually the returned region will be the requested region. But the grid can choose to
+        /// redirect the user to another region: e.g., a default gateway region.
+        /// </remarks>
+        /// <param name="regionID">The region the visitor *wants* to enter</param>
+        /// <param name="agentID">The visitor's User ID. Will be missing (UUID.Zero) in older OpenSims.</param>
+        /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param>
+        /// <param name="message">[out] A message to show to the user (optional, may be null)</param>
+        /// <returns>The region the visitor should enter, or null if no region can be found / is allowed</returns>
+        GridRegion GetHyperlinkRegion(UUID regionID, UUID agentID, string agentHomeURI, out string message);
 
-        bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
+        bool LoginAgent(GridRegion source, AgentCircuitData aCircuit, GridRegion destination, out string reason);
 
     }
 
     public interface IUserAgentService
     {
-        bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);
+        bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);
+        
         void LogoutAgent(UUID userID, UUID sessionID);
+
+        /// <summary>
+        /// Returns the home region of a remote user.
+        /// </summary>
+        /// <returns>On success: the user's home region. If the user doesn't exist: null.</returns>
+        /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
         GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
+
+        /// <summary>
+        /// Returns the Server URLs of a remote user.
+        /// </summary>
+        /// <returns>On success: the user's Server URLs. If the user doesn't exist: an empty dictionary.</returns>
+        /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
         Dictionary<string, object> GetServerURLs(UUID userID);
-        Dictionary<string,object> GetUserInfo(UUID userID);
 
+        /// <summary>
+        /// Returns the UserInfo of a remote user.
+        /// </summary>
+        /// <returns>On success: the user's UserInfo. If the user doesn't exist: an empty dictionary.</returns>
+        /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
+        Dictionary<string, object> GetUserInfo(UUID userID);
+
+        /// <summary>
+        /// Returns the current location of a remote user.
+        /// </summary>
+        /// <returns>On success: the user's Server URLs. If the user doesn't exist: "".</returns>
+        /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
         string LocateUser(UUID userID);
-        // Tries to get the universal user identifier for the targetUserId
-        // on behalf of the userID
+        
+        /// <summary>
+        /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'.
+        /// </summary>
+        /// <returns>On success: the user's UUI. If the user doesn't exist: "".</returns>
+        /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
         string GetUUI(UUID userID, UUID targetUserID);
 
+        /// <summary>
+        /// Returns the remote user that has the given name.
+        /// </summary>
+        /// <returns>On success: the user's UUID. If the user doesn't exist: UUID.Zero.</returns>
+        /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
         UUID GetUUID(String first, String last);
 
         // Returns the local friends online
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index a8bfe47..4289bba 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -55,23 +55,6 @@ namespace OpenSim.Services.Interfaces
         List<InventoryFolderBase> GetInventorySkeleton(UUID userId);
 
         /// <summary>
-        /// Synchronous inventory fetch.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        [Obsolete]
-        InventoryCollection GetUserInventory(UUID userID);
-
-        /// <summary>
-        /// Request the inventory for a user.  This is an asynchronous operation that will call the callback when the
-        /// inventory has been received
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="callback"></param>
-        [Obsolete]
-        void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
-
-        /// <summary>
         /// Retrieve the root inventory folder for the given user.
         /// </summary>
         /// <param name="userID"></param>
@@ -84,15 +67,23 @@ namespace OpenSim.Services.Interfaces
         /// <param name="userID"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        InventoryFolderBase GetFolderForType(UUID userID, AssetType type);
+        InventoryFolderBase GetFolderForType(UUID userID, FolderType type);
 
         /// <summary>
         /// Gets everything (folders and items) inside a folder
         /// </summary>
         /// <param name="userId"></param>
         /// <param name="folderID"></param>
-        /// <returns></returns>
+        /// <returns>Inventory content.  null if the request failed.</returns>
         InventoryCollection GetFolderContent(UUID userID, UUID folderID);
+
+        /// <summary>
+        /// Gets everything (folders and items) inside a folder
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="folderIDs"></param>
+        /// <returns>Inventory content.</returns>
+        InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs);
         
         /// <summary>
         /// Gets the items inside a folder
@@ -173,6 +164,13 @@ namespace OpenSim.Services.Interfaces
         InventoryItemBase GetItem(InventoryItemBase item);
 
         /// <summary>
+        /// Get multiple items, given by their UUIDs
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>null if no item was found, otherwise the found item</returns>
+        InventoryItemBase[] GetMultipleItems(UUID userID, UUID[] ids);
+
+        /// <summary>
         /// Get a folder, given by its UUID
         /// </summary>
         /// <param name="folder"></param>
diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs
index b8d45dd..0d1458e 100644
--- a/OpenSim/Services/Interfaces/IMapImageService.cs
+++ b/OpenSim/Services/Interfaces/IMapImageService.cs
@@ -34,8 +34,14 @@ namespace OpenSim.Services.Interfaces
     public interface IMapImageService
     {
         //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
+<<<<<<< HEAD
+        bool AddMapTile(int x, int y, byte[] imageData, out string reason);
+        bool RemoveMapTile(int x, int y, out string reason);
+        byte[] GetMapTile(string fileName, out string format);
+=======
         bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
         bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
         byte[] GetMapTile(string fileName, UUID scopeID, out string format);
+>>>>>>> avn/ubitvar
     }
 }
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index b629177..ee1e294 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenMetaverse;
 
@@ -53,11 +54,13 @@ namespace OpenSim.Services.Interfaces
         /// <summary>
         /// Ask the simulator hosting the destination to create an agent on that region.
         /// </summary>
+        /// <param name="source">The region that the user is coming from. Will be null if the user
+        /// logged-in directly, or arrived from a simulator that doesn't send this parameter.</param>
         /// <param name="destination"></param>
         /// <param name="aCircuit"></param>
         /// <param name="flags"></param>
         /// <param name="reason">Reason message in the event of a failure.</param>        
-        bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason);
+        bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason);
 
         /// <summary>
         /// Full child agent update.
@@ -83,11 +86,21 @@ namespace OpenSim.Services.Interfaces
         /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param>
         /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param>
         /// <param name="position">Position in the region</param>
+<<<<<<< HEAD
+        /// <param name="sversion">
+        /// Version that the requesting simulator is runing.  If null then no version check is carried out.
+        /// </param>
+        /// <param name="version">Version that the target simulator is running</param>
+        /// <param name="reason">[out] Optional error message</param>
+        /// <returns>True: ok; False: not allowed</returns>
+        bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason);
+=======
         /// <param name="sversion">version that the requesting simulator is runing</param>
         /// <param name="version">version that the target simulator is running</param>
         /// <param name="reason">[out] Optional error message</param>
         /// <returns>True: ok; False: not allowed</returns>
         bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason);
+>>>>>>> avn/ubitvar
 
         /// <summary>
         /// Message from receiving region to departing region, telling it got contacted by the client.
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 6d5d2a0..1814699 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -194,5 +194,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="data"></param>
         /// <returns></returns>
         bool StoreUserAccount(UserAccount data);
+
+        void InvalidateCache(UUID userID);
     }
 }
diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs
new file mode 100644
index 0000000..9e560d5
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IUserManagement.cs
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    /// <summary>
+    /// This maintains the relationship between a UUID and a user name.
+    /// </summary>
+    public interface IUserManagement
+    {
+        string GetUserName(UUID uuid);
+        string GetUserHomeURL(UUID uuid);
+        string GetUserUUI(UUID uuid);
+        bool GetUserUUI(UUID userID, out string uui);
+        string GetUserServerURL(UUID uuid, string serverType);
+
+        /// <summary>
+        /// Get user ID by the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>UUID.Zero if no user with that name is found or if the name is "Unknown User"</returns>
+        UUID GetUserIdByName(string name);
+
+        /// <summary>
+        /// Get user ID by the given name.
+        /// </summary>
+        /// <param name="firstName"></param>
+        /// <param name="lastName"></param>
+        /// <returns>UUID.Zero if no user with that name is found or if the name is "Unknown User"</returns>
+        UUID GetUserIdByName(string firstName, string lastName);
+
+        /// <summary>
+        /// Add a user.
+        /// </summary>
+        /// <remarks>
+        /// If an account is found for the UUID, then the names in this will be used rather than any information
+        /// extracted from creatorData.
+        /// </remarks>
+        /// <param name="uuid"></param>
+        /// <param name="creatorData">The creator data for this user.</param>
+        void AddUser(UUID uuid, string creatorData);
+
+        /// <summary>
+        /// Add a user.
+        /// </summary>
+        /// <remarks>
+        /// The UUID is related to the name without any other checks being performed, such as user account presence.
+        /// </remarks>
+        /// <param name="uuid"></param>
+        /// <param name="firstName"></param>
+        /// <param name="lastName"></param>
+        void AddUser(UUID uuid, string firstName, string lastName);
+
+        /// <summary>
+        /// Add a user.
+        /// </summary>
+        /// <remarks>
+        /// The arguments apart from uuid are formed into a creatorData string and processing proceeds as for the
+        /// AddUser(UUID uuid, string creatorData) method.
+        /// </remarks>
+        /// <param name="uuid"></param>
+        /// <param name="firstName"></param>
+        /// <param name="profileURL"></param>
+        void AddUser(UUID uuid, string firstName, string lastName, string homeURL);
+
+        bool IsLocalGridUser(UUID uuid);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/OpenProfileClient.cs b/OpenSim/Services/Interfaces/OpenProfileClient.cs
new file mode 100644
index 0000000..bda8151
--- /dev/null
+++ b/OpenSim/Services/Interfaces/OpenProfileClient.cs
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Text;
+using System.Xml;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Services.UserProfilesService
+{
+    /// <summary>
+    /// A client for accessing a profile server using the OpenProfile protocol.
+    /// </summary>
+    /// <remarks>
+    /// This class was adapted from the full OpenProfile class. Since it's only a client, and not a server,
+    /// it's much simpler.
+    /// </remarks>
+    public class OpenProfileClient
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private string m_serverURI;
+
+        /// <summary>
+        /// Creates a client for accessing a foreign grid's profile server using the OpenProfile protocol.
+        /// </summary>
+        /// <param name="serverURI">The grid's profile server URL</param>
+        public OpenProfileClient(string serverURI)
+        {
+            m_serverURI = serverURI;
+        }
+               
+        /// <summary>
+        /// Gets an avatar's profile using the OpenProfile protocol.
+        /// </summary>
+        /// <param name="props">On success, this will contain the avatar's profile</param>
+        /// <returns>Success/failure</returns>
+        /// <remarks>
+        /// There are two profile modules currently in use in OpenSim: the older one is OpenProfile, and the newer
+        /// one is UserProfileModule (this file). This method attempts to read an avatar's profile from a foreign
+        /// grid using the OpenProfile protocol.
+        /// </remarks>
+        public bool RequestAvatarPropertiesUsingOpenProfile(ref UserProfileProperties props)
+        {
+            Hashtable ReqHash = new Hashtable();
+            ReqHash["avatar_id"] = props.UserId.ToString();
+
+            Hashtable profileData = XMLRPCRequester.SendRequest(ReqHash, "avatar_properties_request", m_serverURI);
+
+            if (profileData == null)
+                return false;
+            if (!profileData.ContainsKey("data"))
+                return false;
+
+            ArrayList dataArray = (ArrayList)profileData["data"];
+
+            if (dataArray == null || dataArray[0] == null)
+                return false;
+            profileData = (Hashtable)dataArray[0];
+
+            props.WebUrl = string.Empty;
+            props.AboutText = String.Empty;
+            props.FirstLifeText = String.Empty;
+            props.ImageId = UUID.Zero;
+            props.FirstLifeImageId = UUID.Zero;
+            props.PartnerId = UUID.Zero;
+
+            if (profileData["ProfileUrl"] != null)
+                props.WebUrl = profileData["ProfileUrl"].ToString();
+            if (profileData["AboutText"] != null)
+                props.AboutText = profileData["AboutText"].ToString();
+            if (profileData["FirstLifeAboutText"] != null)
+                props.FirstLifeText = profileData["FirstLifeAboutText"].ToString();
+            if (profileData["Image"] != null)
+                props.ImageId = new UUID(profileData["Image"].ToString());
+            if (profileData["FirstLifeImage"] != null)
+                props.FirstLifeImageId = new UUID(profileData["FirstLifeImage"].ToString());
+            if (profileData["Partner"] != null)
+                props.PartnerId = new UUID(profileData["Partner"].ToString());
+
+            props.WantToMask = 0;
+            props.WantToText = String.Empty;
+            props.SkillsMask = 0;
+            props.SkillsText = String.Empty;
+            props.Language = String.Empty;
+
+            if (profileData["wantmask"] != null)
+                props.WantToMask = Convert.ToInt32(profileData["wantmask"].ToString());
+            if (profileData["wanttext"] != null)
+                props.WantToText = profileData["wanttext"].ToString();
+
+            if (profileData["skillsmask"] != null)
+                props.SkillsMask = Convert.ToInt32(profileData["skillsmask"].ToString());
+            if (profileData["skillstext"] != null)
+                props.SkillsText = profileData["skillstext"].ToString();
+
+            if (profileData["languages"] != null)
+                props.Language = profileData["languages"].ToString();
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
index f7c8cc1..a2f6c4f 100644
--- a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
index fd8707b..6a1187c 100644
--- a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 7bad4b0..b75193f 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -111,40 +111,48 @@ namespace OpenSim.Services.InventoryService
 
             if (rootFolder == null)
             {
-                rootFolder = ConvertToOpenSim(CreateFolder(principalID, UUID.Zero, (int)AssetType.RootFolder, "My Inventory"));
+                rootFolder = ConvertToOpenSim(CreateFolder(principalID, UUID.Zero, (int)FolderType.Root, InventoryFolderBase.ROOT_FOLDER_NAME));
                 result = true;
             }
 
             XInventoryFolder[] sysFolders = GetSystemFolders(principalID, rootFolder.ID);
 
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Animation) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Animation, "Animations");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Bodypart) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Bodypart, "Body Parts");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.CallingCard) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.CallingCard, "Calling Cards");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Clothing) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Clothing, "Clothing");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Gesture) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Gesture, "Gestures");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Landmark) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Landmark, "Landmarks");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.LostAndFoundFolder) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.LostAndFoundFolder, "Lost And Found");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Notecard) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Notecard, "Notecards");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Object) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Object, "Objects");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.SnapshotFolder) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.SnapshotFolder, "Photo Album");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.LSLText) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.LSLText, "Scripts");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Sound) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Sound, "Sounds");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Texture) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.Texture, "Textures");
-            if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.TrashFolder) return true; return false; }))
-                CreateFolder(principalID, rootFolder.ID, (int)AssetType.TrashFolder, "Trash");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Animation) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Animation, "Animations");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.BodyPart) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.BodyPart, "Body Parts");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.CallingCard) return true; return false; }))
+            {
+                XInventoryFolder folder = CreateFolder(principalID, rootFolder.ID, (int)FolderType.CallingCard, "Calling Cards");
+                folder = CreateFolder(principalID, folder.folderID, (int)FolderType.CallingCard, "Friends");
+                CreateFolder(principalID, folder.folderID, (int)FolderType.CallingCard, "All");
+            }
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Clothing) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Clothing, "Clothing");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.CurrentOutfit) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.CurrentOutfit, "Current Outfit");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Favorites) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Favorites, "Favorites");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Gesture) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Gesture, "Gestures");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Landmark) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Landmark, "Landmarks");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.LostAndFound) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.LostAndFound, "Lost And Found");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Notecard) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Notecard, "Notecards");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Object) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Object, "Objects");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Snapshot) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Snapshot, "Photo Album");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.LSLText) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.LSLText, "Scripts");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Sound) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Sound, "Sounds");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Texture) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Texture, "Textures");
+            if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Trash) return true; return false; }))
+                CreateFolder(principalID, rootFolder.ID, (int)FolderType.Trash, "Trash");
 
             return result;
         }
@@ -220,7 +228,7 @@ namespace OpenSim.Services.InventoryService
             XInventoryFolder root = null;
             foreach (XInventoryFolder folder in folders)
             {
-                if (folder.folderName == "My Inventory")
+                if (folder.folderName == InventoryFolderBase.ROOT_FOLDER_NAME)
                 {
                     root = folder;
                     break;
@@ -233,7 +241,7 @@ namespace OpenSim.Services.InventoryService
             return ConvertToOpenSim(root);
         }
 
-        public virtual InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
+        public virtual InventoryFolderBase GetFolderForType(UUID principalID, FolderType type)
         {
 //            m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0} for user {1}", type, principalID);
 
@@ -251,11 +259,11 @@ namespace OpenSim.Services.InventoryService
             return GetSystemFolderForType(rootFolder, type);
         }
 
-        private InventoryFolderBase GetSystemFolderForType(InventoryFolderBase rootFolder, AssetType type)
+        private InventoryFolderBase GetSystemFolderForType(InventoryFolderBase rootFolder, FolderType type)
         {
-//            m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0} for user {1}", type, principalID);
-            
-            if (type == AssetType.RootFolder)
+            //m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0}", type);
+
+            if (type == FolderType.Root)
                 return rootFolder;
 
             XInventoryFolder[] folders = m_Database.GetFolders(
@@ -264,13 +272,13 @@ namespace OpenSim.Services.InventoryService
 
             if (folders.Length == 0)
             {
-//                m_log.WarnFormat("[XINVENTORY SERVICE]: Found no folder for type {0} for user {1}", type, principalID);
+                //m_log.WarnFormat("[XINVENTORY SERVICE]: Found no folder for type {0} ", type);
                 return null;
             }
-            
-//            m_log.DebugFormat(
-//                "[XINVENTORY SERVICE]: Found folder {0} {1} for type {2} for user {3}", 
-//                folders[0].folderName, folders[0].folderID, type, principalID);
+
+            //m_log.DebugFormat(
+            //    "[XINVENTORY SERVICE]: Found folder {0} {1} for type {2}",
+            //    folders[0].folderName, folders[0].folderID, type);
 
             return ConvertToOpenSim(folders[0]);
         }
@@ -283,7 +291,7 @@ namespace OpenSim.Services.InventoryService
             //
             //m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString());
             InventoryCollection inventory = new InventoryCollection();
-            inventory.UserID = principalID;
+            inventory.OwnerID = principalID;
             inventory.Folders = new List<InventoryFolderBase>();
             inventory.Items = new List<InventoryItemBase>();
 
@@ -307,8 +315,27 @@ namespace OpenSim.Services.InventoryService
                 inventory.Items.Add(ConvertToOpenSim(i));
             }
 
+            InventoryFolderBase f = new InventoryFolderBase(folderID, principalID);
+            f = GetFolder(f);
+            if (f != null)
+            {
+                inventory.Version = f.Version;
+                inventory.OwnerID = f.Owner;
+            }
+            inventory.FolderID = folderID;
+
             return inventory;
         }
+
+        public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
+        {
+            InventoryCollection[] multiple = new InventoryCollection[folderIDs.Length];
+            int i = 0;
+            foreach (UUID fid in folderIDs)
+                multiple[i++] = GetFolderContent(principalID, fid);
+
+            return multiple;
+        }
         
         public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
         {
@@ -336,7 +363,7 @@ namespace OpenSim.Services.InventoryService
             if (check != null)
                 return false;
 
-            if (folder.Type != (short)AssetType.Folder && folder.Type != (short)AssetType.Unknown)
+            if (folder.Type != (short)FolderType.None)
             {
                 InventoryFolderBase rootFolder = GetRootFolder(folder.Owner);
 
@@ -353,7 +380,7 @@ namespace OpenSim.Services.InventoryService
                 if (folder.ParentID == rootFolder.ID)
                 {
                     InventoryFolderBase existingSystemFolder
-                        = GetSystemFolderForType(rootFolder, (AssetType)folder.Type);
+                        = GetSystemFolderForType(rootFolder, (FolderType)folder.Type);
 
                     if (existingSystemFolder != null)
                     {
@@ -380,8 +407,8 @@ namespace OpenSim.Services.InventoryService
             if (check == null)
                 return AddFolder(folder);
 
-            if ((check.Type != (short)AssetType.Unknown || xFolder.type != (short)AssetType.Unknown)
-                && (check.Type != (short)AssetType.OutfitFolder || xFolder.type != (short)AssetType.OutfitFolder))
+            if ((check.Type != (short)FolderType.None || xFolder.type != (short)FolderType.None)
+                && (check.Type != (short)FolderType.Outfit || xFolder.type != (short)FolderType.Outfit))
             {
                 if (xFolder.version < check.Version)
                 {
@@ -583,6 +610,21 @@ namespace OpenSim.Services.InventoryService
             return ConvertToOpenSim(items[0]);
         }
 
+        public virtual InventoryItemBase[] GetMultipleItems(UUID userID, UUID[] ids)
+        {
+            InventoryItemBase[] items = new InventoryItemBase[ids.Length];
+            int i = 0;
+            InventoryItemBase item = new InventoryItemBase();
+            item.Owner = userID;
+            foreach (UUID id in ids)
+            {
+                item.ID = id;
+                items[i++] = GetItem(item);
+            }
+
+            return items;
+        }
+
         public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             XInventoryFolder[] folders = m_Database.GetFolders(
@@ -615,34 +657,6 @@ namespace OpenSim.Services.InventoryService
             return m_Database.GetAssetPermissions(principalID, assetID);
         }
 
-        public virtual InventoryCollection GetUserInventory(UUID userID)
-        {
-            InventoryCollection userInventory = new InventoryCollection();
-            userInventory.UserID = userID;
-            userInventory.Folders = new List<InventoryFolderBase>();
-            userInventory.Items = new List<InventoryItemBase>();
-
-            List<InventoryFolderBase> skel = GetInventorySkeleton(userID);
-            if (skel != null)
-            {
-                foreach (InventoryFolderBase f in skel)
-                {
-                    InventoryCollection c = GetFolderContent(userID, f.ID);
-                    if (c != null && c.Items != null && c.Items.Count > 0)
-                        userInventory.Items.AddRange(c.Items);
-                    if (c != null && c.Folders != null && c.Folders.Count > 0)
-                        userInventory.Folders.AddRange(c.Folders);
-                }
-            }
-            m_log.DebugFormat("[XINVENTORY SERVICE]: GetUserInventory for user {0} returning {1} folders and {2} items",
-                userID, userInventory.Folders.Count, userInventory.Items.Count);
-            return userInventory;
-        }
-
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
-        {
-        }
-
         // Unused.
         //
         public bool HasInventoryForUser(UUID userID)
@@ -658,9 +672,9 @@ namespace OpenSim.Services.InventoryService
 
             newFolder.ParentID = folder.parentFolderID;
             newFolder.Type = (short)folder.type;
-            // Viewer can't understand anything that's not in it's LLFolderType enum
-            if (newFolder.Type == 100)
-                newFolder.Type = -1;
+            //// Viewer can't understand anything that's not in it's LLFolderType enum
+            //if (newFolder.Type == InventoryItemBase.SUITCASE_FOLDER_TYPE)
+            //    newFolder.Type = InventoryItemBase.SUITCASE_FOLDER_FAKE_TYPE;
             newFolder.Version = (ushort)folder.version;
             newFolder.Name = folder.folderName;
             newFolder.Owner = folder.agentID;
@@ -751,7 +765,7 @@ namespace OpenSim.Services.InventoryService
             if (folder.Length < 1)
                 return false;
 
-            if (folder[0].type == (int)AssetType.TrashFolder)
+            if (folder[0].type == (int)FolderType.Trash)
                 return true;
 
             UUID parentFolder = folder[0].parentFolderID;
@@ -762,9 +776,9 @@ namespace OpenSim.Services.InventoryService
                 if (parent.Length < 1)
                     return false;
 
-                if (parent[0].type == (int)AssetType.TrashFolder)
+                if (parent[0].type == (int)FolderType.Trash)
                     return true;
-                if (parent[0].type == (int)AssetType.RootFolder)
+                if (parent[0].type == (int)FolderType.Root)
                     return false;
 
                 parentFolder = parent[0].parentFolderID;
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index da351b9..92d93ee 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -197,6 +197,7 @@ namespace OpenSim.Services.LLLoginService
 
         private string currency;
         private string classifiedFee;
+        private int    maxAgentGroups;
 
         static LLLoginResponse()
         {
@@ -233,8 +234,13 @@ namespace OpenSim.Services.LLLoginService
         public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
+<<<<<<< HEAD
+            GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency,
+            string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee, int maxAgentGroups)
+=======
             GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
             string DSTZone, string destinationsURL, string avatarsURL, UUID realID, string classifiedFee)
+>>>>>>> avn/ubitvar
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -260,12 +266,13 @@ namespace OpenSim.Services.LLLoginService
             SearchURL = searchURL;
             Currency = currency;
             ClassifiedFee = classifiedFee;
+            MaxAgentGroups = maxAgentGroups;
 
             FillOutHomeData(pinfo, home);
             LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
 
             FillOutRegionData(destination);
-            // m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX=<{0},{1}>", RegionSizeX, RegionSizeY);
+            m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
 
             FillOutSeedCap(aCircuit, destination, clientIP);
 
@@ -492,6 +499,7 @@ namespace OpenSim.Services.LLLoginService
 
             currency = String.Empty;
             ClassifiedFee = "0";
+            MaxAgentGroups = 42;
         }
 
 
@@ -552,12 +560,13 @@ namespace OpenSim.Services.LLLoginService
                 responseData["seed_capability"] = seedCapability;
                 responseData["home"] = home;
                 responseData["look_at"] = lookAt;
+                responseData["max-agent-groups"] = MaxAgentGroups;
                 responseData["message"] = welcomeMessage;
                 responseData["region_x"] = (Int32)(RegionX);
                 responseData["region_y"] = (Int32)(RegionY);
                 responseData["region_size_x"] = (Int32)RegionSizeX;
                 responseData["region_size_y"] = (Int32)RegionSizeY;
-                // m_log.DebugFormat("[LOGIN RESPONSE] returning sizeX=<{0},{1}>", RegionSizeX, RegionSizeY);
+                m_log.DebugFormat("[LOGIN RESPONSE] returning sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
 
                 if (searchURL != String.Empty)
                     responseData["search"] = searchURL;
@@ -680,6 +689,7 @@ namespace OpenSim.Services.LLLoginService
                 map["seed_capability"] = OSD.FromString(seedCapability);
                 map["home"] = OSD.FromString(home);
                 map["look_at"] = OSD.FromString(lookAt);
+                map["max-agent-groups"] = OSD.FromInteger(MaxAgentGroups);
                 map["message"] = OSD.FromString(welcomeMessage);
                 map["region_x"] = OSD.FromInteger(RegionX);
                 map["region_y"] = OSD.FromInteger(RegionY);
@@ -794,7 +804,7 @@ namespace OpenSim.Services.LLLoginService
             Hashtable TempHash;
             foreach (InventoryFolderBase InvFolder in folders)
             {
-                if (InvFolder.ParentID == UUID.Zero && InvFolder.Name == "My Inventory")
+                if (InvFolder.ParentID == UUID.Zero && InvFolder.Name == InventoryFolderBase.ROOT_FOLDER_NAME)
                 {
                     rootID = InvFolder.ID;
                 }
@@ -1119,6 +1129,12 @@ namespace OpenSim.Services.LLLoginService
             set { classifiedFee = value; }
         }
 
+        public int MaxAgentGroups
+        {
+            get { return maxAgentGroups; }
+            set { maxAgentGroups = value; }
+        }
+
         public string DestinationsURL
         {
             get; set;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index b009e64..ba69e95 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Services.LLLoginService
         protected IGridUserService m_GridUserService;
         protected IAuthenticationService m_AuthenticationService;
         protected IInventoryService m_InventoryService;
+        protected IInventoryService m_HGInventoryService;
         protected IGridService m_GridService;
         protected IPresenceService m_PresenceService;
         protected ISimulationService m_LocalSimulationService;
@@ -76,17 +77,15 @@ namespace OpenSim.Services.LLLoginService
         protected string m_GatekeeperURL;
         protected bool m_AllowRemoteSetLoginLevel;
         protected string m_MapTileURL;
-        protected string m_ProfileURL;
-        protected string m_OpenIDURL;
         protected string m_SearchURL;
         protected string m_Currency;
         protected string m_ClassifiedFee;
+        protected int m_MaxAgentGroups;
         protected string m_DestinationGuide;
         protected string m_AvatarPicker;
-
         protected string m_AllowedClients;
         protected string m_DeniedClients;
-
+        protected string m_MessageUrl;
         protected string m_DSTZone;
 
         IConfig m_LoginServerConfig;
@@ -118,8 +117,6 @@ namespace OpenSim.Services.LLLoginService
             m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
                 new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty);
             m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
-            m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
-            m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
             m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
             m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
             m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
@@ -128,9 +125,14 @@ namespace OpenSim.Services.LLLoginService
 
             m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
             m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
-
+            m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty);
             m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time");
 
+            IConfig groupConfig = config.Configs["Groups"];
+            if (groupConfig != null)
+                m_MaxAgentGroups = groupConfig.GetInt("MaxAgentGroups", 42);
+
+
             // Clean up some of these vars
             if (m_MapTileURL != String.Empty)
             {
@@ -166,6 +168,15 @@ namespace OpenSim.Services.LLLoginService
             if (agentService != string.Empty)
                 m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args);
 
+            // Get the Hypergrid inventory service (exists only if Hypergrid is enabled)
+            string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty);
+            if (hgInvServicePlugin != string.Empty)
+            {
+                string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty);
+                Object[] args2 = new Object[] { config, hgInvServiceArg };
+                m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args2);
+            }
+
             //
             // deal with the services given as argument
             //
@@ -251,8 +262,12 @@ namespace OpenSim.Services.LLLoginService
         {
             bool success = false;
             UUID session = UUID.Random();
+<<<<<<< HEAD
+            string processedMessage;
+=======
             if (clientVersion.Contains("Radegast"))
                 LibOMVclient = false;
+>>>>>>> avn/ubitvar
 
 
             m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ",
@@ -361,6 +376,13 @@ namespace OpenSim.Services.LLLoginService
                     return LLFailedLoginResponse.InventoryProblem;
                 }
 
+                if (m_HGInventoryService != null)
+                {
+                    // Give the Suitcase service a chance to create the suitcase folder.
+                    // (If we're not using the Suitcase inventory service then this won't do anything.)
+                    m_HGInventoryService.GetRootFolder(account.PrincipalID);
+                }
+
                 List<InventoryFolderBase> inventorySkel = m_InventoryService.GetInventorySkeleton(account.PrincipalID);
                 if (m_RequireInventory && ((inventorySkel == null) || (inventorySkel != null && inventorySkel.Count == 0)))
                 {
@@ -395,11 +417,30 @@ namespace OpenSim.Services.LLLoginService
                 //
                 GridRegion home = null;
                 GridUserInfo guinfo = m_GridUserService.LoggedIn(account.PrincipalID.ToString());
-                if (guinfo != null && (guinfo.HomeRegionID != UUID.Zero) && m_GridService != null)
+
+                // We are only going to complain about no home if the user actually tries to login there, to avoid
+                // spamming the console.
+                if (guinfo != null)
                 {
-                    home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
+                    if (guinfo.HomeRegionID == UUID.Zero && startLocation == "home")
+                    {
+                        m_log.WarnFormat(
+                            "[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location but they have none set",
+                            account.Name);
+                    }
+                    else if (m_GridService != null)
+                    {
+                        home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
+
+                        if (home == null && startLocation == "home")
+                        {
+                            m_log.WarnFormat(
+                                "[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location with ID {1} but this was not found.",
+                                account.Name, guinfo.HomeRegionID);
+                        }
+                    }
                 }
-                if (guinfo == null)
+                else
                 {
                     // something went wrong, make something up, so that we don't have to test this anywhere else
                     m_log.DebugFormat("{0} Failed to fetch GridUserInfo. Creating empty GridUserInfo as home", LogHeader);
@@ -469,17 +510,36 @@ namespace OpenSim.Services.LLLoginService
                 //
                 // Finally, fill out the response and return it
                 //
+                if (m_MessageUrl != String.Empty)
+                {
+                    WebClient client = new WebClient();
+                    processedMessage = client.DownloadString(m_MessageUrl);
+                }
+                else
+                {
+                    processedMessage = m_WelcomeMessage;
+                }
+                processedMessage = processedMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName);
+
                 LLLoginResponse response
+<<<<<<< HEAD
+                        = new LLLoginResponse(
+                            account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
+                            where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP,
+                            m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone,
+                            m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee, m_MaxAgentGroups);
+=======
                     = new LLLoginResponse(
                         account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
                         where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
                         m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
                         m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee);
+>>>>>>> avn/ubitvar
 
-                m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
+                    m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
 
-                return response;
-            }
+                    return response;
+               }
             catch (Exception e)
             {
                 m_log.WarnFormat("[LLOGIN SERVICE]: Exception processing login for {0} {1}: {2} {3}", firstName, lastName, e.ToString(), e.StackTrace);
@@ -520,10 +580,6 @@ namespace OpenSim.Services.LLLoginService
 
                 if (home == null)
                 {
-                    m_log.WarnFormat(
-                        "[LLOGIN SERVICE]: User {0} {1} tried to login to a 'home' start location but they have none set",
-                        account.FirstName, account.LastName);
-                    
                     tryDefaults = true;
                 }
                 else
@@ -598,7 +654,7 @@ namespace OpenSim.Services.LLLoginService
                 // e.g. New Moon&135&46  New Moon@osgrid.org:8002&153&34
                 where = "url";
                 GridRegion region = null;
-                Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$");
+                Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+[.]?\d*)&(?<y>\d+[.]?\d*)&(?<z>\d+[.]?\d*)$");
                 Match uriMatch = reURI.Match(startLocation);
                 if (uriMatch == null)
                 {
@@ -667,8 +723,7 @@ namespace OpenSim.Services.LLLoginService
                             if (parts.Length > 1)
                                 UInt32.TryParse(parts[1], out port);
 
-//                            GridRegion region = FindForeignRegion(domainName, port, regionName, out gatekeeper);
-                            region = FindForeignRegion(domainName, port, regionName, out gatekeeper);
+                            region = FindForeignRegion(domainName, port, regionName, account, out gatekeeper);
                             return region;
                         }
                     }
@@ -717,7 +772,7 @@ namespace OpenSim.Services.LLLoginService
             return null;
         }
 
-        private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper)
+        private GridRegion FindForeignRegion(string domainName, uint port, string regionName, UserAccount account, out GridRegion gatekeeper)
         {
             m_log.Debug("[LLLOGIN SERVICE]: attempting to findforeignregion " + domainName + ":" + port.ToString() + ":" + regionName);
             gatekeeper = new GridRegion();
@@ -729,9 +784,14 @@ namespace OpenSim.Services.LLLoginService
             UUID regionID;
             ulong handle;
             string imageURL = string.Empty, reason = string.Empty;
+            string message;
             if (m_GatekeeperConnector.LinkRegion(gatekeeper, out regionID, out handle, out domainName, out imageURL, out reason))
             {
-                GridRegion destination = m_GatekeeperConnector.GetHyperlinkRegion(gatekeeper, regionID);
+                string homeURI = null;
+                if (account.ServiceURLs != null && account.ServiceURLs.ContainsKey("HomeURI"))
+                    homeURI = (string)account.ServiceURLs["HomeURI"];
+                
+                GridRegion destination = m_GatekeeperConnector.GetHyperlinkRegion(gatekeeper, regionID, account.PrincipalID, homeURI, out message);
                 return destination;
             }
 
@@ -924,6 +984,13 @@ namespace OpenSim.Services.LLLoginService
                     m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]);
                 }
 
+                if (!account.ServiceURLs.ContainsKey("GatekeeperURI") && !string.IsNullOrEmpty(m_GatekeeperURL))
+                {
+                    m_log.DebugFormat("[LLLOGIN SERVICE]: adding gatekeeper uri {0}", m_GatekeeperURL);
+                    account.ServiceURLs["GatekeeperURI"] = m_GatekeeperURL;
+                    newUrls = true;
+                }
+
                 // The grid operator decided to override the defaults in the
                 // [LoginService] configuration. Let's store the correct ones.
                 if (newUrls)
@@ -934,13 +1001,21 @@ namespace OpenSim.Services.LLLoginService
 
         private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason)
         {
-            return simConnector.CreateAgent(region, aCircuit, (uint)flags, out reason);
+            string version;
+
+            if (
+                !simConnector.QueryAccess(
+                    region, aCircuit.AgentID, null, true, aCircuit.startpos, "SIMULATION/0.3", new List<UUID>(), out version, out reason))
+                return false;
+
+            return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason);
         }
 
         private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason)
         {
-            m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
-            if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, true, out reason))
+            m_log.Debug("[LLOGIN SERVICE]: Launching agent at " + destination.RegionName);
+
+            if (m_UserAgentService.LoginAgentToGrid(null, aCircuit, gatekeeper, destination, true, out reason))
                 return true;
             return false;
         }
diff --git a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
index c373351..4dc492a 100644
--- a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 2db1d14..fcace3a 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -54,6 +54,9 @@ namespace OpenSim.Services.MapImageService
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
+#pragma warning disable 414
+        private string LogHeader = "[MAP IMAGE SERVICE]";
+#pragma warning restore 414
 
         private const int ZOOM_LEVELS = 8;
         private const int IMAGE_WIDTH = 256;
@@ -128,6 +131,16 @@ namespace OpenSim.Services.MapImageService
                     return false;
                 }
             }
+<<<<<<< HEAD
+
+            return UpdateMultiResolutionFilesAsync(x, y, out reason);
+        }
+
+        public bool RemoveMapTile(int x, int y, out string reason)
+        {
+            reason = String.Empty;
+            string fileName = GetFileName(1, x, y);
+=======
 
             return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
         }
@@ -136,24 +149,40 @@ namespace OpenSim.Services.MapImageService
         {
             reason = String.Empty;
             string fileName = GetFileName(1, x, y, scopeID);
+>>>>>>> avn/ubitvar
 
             lock (m_Sync)
             {
                 try
+<<<<<<< HEAD
                 {
                     File.Delete(fileName);
                 }
                 catch (Exception e)
                 {
+=======
+                {
+                    File.Delete(fileName);
+                }
+                catch (Exception e)
+                {
+>>>>>>> avn/ubitvar
                     m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to save delete file {0}: {1}", fileName, e);
                     reason = e.Message;
                     return false;
                 }
             }
+<<<<<<< HEAD
+
+            return UpdateMultiResolutionFilesAsync(x, y, out reason);
+        }
+
+=======
 
             return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
         }
 
+>>>>>>> avn/ubitvar
         // When large varregions start up, they can send piles of new map tiles. This causes
         //    this multi-resolution routine to be called a zillion times an causes much CPU
         //    time to be spent creating multi-resolution tiles that will be replaced when
@@ -162,6 +191,25 @@ namespace OpenSim.Services.MapImageService
         {
             public int xx;
             public int yy;
+<<<<<<< HEAD
+            public mapToMultiRez(int pX, int pY)
+            {
+                xx = pX;
+                yy = pY;
+            }
+        };
+        private Queue<mapToMultiRez> multiRezToBuild = new Queue<mapToMultiRez>();
+        private bool UpdateMultiResolutionFilesAsync(int x, int y, out string reason)
+        {
+            reason = String.Empty;
+            lock (multiRezToBuild)
+            {
+                // m_log.DebugFormat("{0} UpdateMultiResolutionFilesAsync: scheduling update for <{1},{2}>", LogHeader, x, y);
+                multiRezToBuild.Enqueue(new mapToMultiRez(x, y));
+                if (multiRezToBuild.Count == 1)
+                    Util.FireAndForget(
+                        DoUpdateMultiResolutionFilesAsync, null, "MapImageService.DoUpdateMultiResolutionFilesAsync");
+=======
             public UUID scopeID;
             public mapToMultiRez(int pX, int pY, UUID pscopeID)
             {
@@ -183,6 +231,7 @@ namespace OpenSim.Services.MapImageService
                 if (multiRezToBuild.Count == 1)
                     Util.FireAndForget(
                         DoUpdateMultiResolutionFilesAsync);
+>>>>>>> avn/ubitvar
             }
 
             return true;
@@ -190,8 +239,15 @@ namespace OpenSim.Services.MapImageService
 
         private void DoUpdateMultiResolutionFilesAsync(object o)
         {
+<<<<<<< HEAD
+            // This sleep causes the FireAndForget thread to be different than the invocation thread.
+            // It also allows other tiles to be uploaded so the multi-rez images are more likely
+            //     to be correct.
+            Thread.Sleep(1 * 1000);
+=======
             // let acumulate large region tiles
             Thread.Sleep(60 * 1000); // large regions take time to upload tiles
+>>>>>>> avn/ubitvar
 
             while (multiRezToBuild.Count > 0)
             {
@@ -205,22 +261,35 @@ namespace OpenSim.Services.MapImageService
                 {
                     int x = toMultiRez.xx;
                     int y = toMultiRez.yy;
+<<<<<<< HEAD
+                    // m_log.DebugFormat("{0} DoUpdateMultiResolutionFilesAsync: doing build for <{1},{2}>", LogHeader, x, y);
+
+=======
                     UUID scopeID = toMultiRez.scopeID;
                     // m_log.DebugFormat("{0} DoUpdateMultiResolutionFilesAsync: doing build for <{1},{2}>", LogHeader, x, y);
 
                     int width = 1;
+>>>>>>> avn/ubitvar
                     // Stitch seven more aggregate tiles together
                     for (uint zoomLevel = 2; zoomLevel <= ZOOM_LEVELS; zoomLevel++)
                     {
                         // Calculate the width (in full resolution tiles) and bottom-left
                         // corner of the current zoom level
+<<<<<<< HEAD
+                        int width = (int)Math.Pow(2, (double)(zoomLevel - 1));
+=======
                         width *= 2;
+>>>>>>> avn/ubitvar
                         int x1 = x - (x % width);
                         int y1 = y - (y % width);
 
                         lock (m_Sync)   // must lock the reading and writing of the maptile files
                         {
+<<<<<<< HEAD
+                            if (!CreateTile(zoomLevel, x1, y1))
+=======
                             if (!CreateTile(zoomLevel, x1, y1, scopeID))
+>>>>>>> avn/ubitvar
                             {
                                 m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to create tile for {0},{1} at zoom level {1}", x, y, zoomLevel);
                                 return;
@@ -229,6 +298,10 @@ namespace OpenSim.Services.MapImageService
                     }
                 }
             }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
             return;
         }
 
diff --git a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
index edadb26..e5f1bf9 100644
--- a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index ed2703e..0fe0200 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -41,9 +41,7 @@ namespace OpenSim.Services.PresenceService
 {
     public class PresenceService : PresenceServiceBase, IPresenceService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected bool m_allowDuplicatePresences = false;
 
@@ -55,19 +53,15 @@ namespace OpenSim.Services.PresenceService
             IConfig presenceConfig = config.Configs["PresenceService"];
             if (presenceConfig != null)
             {
-                m_allowDuplicatePresences =
-                        presenceConfig.GetBoolean("AllowDuplicatePresences",
-                                                  m_allowDuplicatePresences);
+                m_allowDuplicatePresences = presenceConfig.GetBoolean("AllowDuplicatePresences", m_allowDuplicatePresences);
             }
         }
 
-        public bool LoginAgent(string userID, UUID sessionID,
-                UUID secureSessionID)
+        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
         {
-            //PresenceData[] d = m_Database.Get("UserID", userID);
-            //m_Database.Get("UserID", userID);
+            PresenceData prevUser = GetUser(userID);
 
-            if (!m_allowDuplicatePresences)
+            if (!m_allowDuplicatePresences && (prevUser != null))
                 m_Database.Delete("UserID", userID.ToString());
 
             PresenceData data = new PresenceData();
@@ -80,19 +74,41 @@ namespace OpenSim.Services.PresenceService
             
             m_Database.Store(data);
 
-            m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent {0} with session {1} and ssession {2}",
-                userID, sessionID, secureSessionID);
+            string prevUserStr = "";
+            if (prevUser != null)
+                prevUserStr = string.Format(". This user was already logged-in: session {0}, region {1}", prevUser.SessionID, prevUser.RegionID);
+
+            m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent: session {0}, user {1}, region {2}, secure session {3}{4}",
+                data.SessionID, data.UserID, data.RegionID, secureSessionID, prevUserStr);
+            
             return true;
         }
 
         public bool LogoutAgent(UUID sessionID)
         {
-            m_log.DebugFormat("[PRESENCE SERVICE]: Session {0} logout", sessionID);
+            PresenceInfo presence = GetAgent(sessionID);
+
+            m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}",
+                sessionID,
+                (presence == null) ? null : presence.UserID,
+                (presence == null) ? null : presence.RegionID.ToString());
+            
             return m_Database.Delete("SessionID", sessionID.ToString());
         }
 
         public bool LogoutRegionAgents(UUID regionID)
         {
+            PresenceData[] prevSessions = GetRegionAgents(regionID);
+
+            if ((prevSessions == null) || (prevSessions.Length == 0))
+                return true;
+
+            m_log.DebugFormat("[PRESENCE SERVICE]: Logout users in region {0}: {1}", regionID,
+                string.Join(", ", Array.ConvertAll(prevSessions, session => session.UserID)));
+
+            // There's a small chance that LogoutRegionAgents() will logout different users than the
+            // list that was logged above, but it's unlikely and not worth dealing with.
+
             m_Database.LogoutRegionAgents(regionID);
 
             return true;
@@ -101,20 +117,26 @@ namespace OpenSim.Services.PresenceService
 
         public bool ReportAgent(UUID sessionID, UUID regionID)
         {
-//            m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
             try
             {
-                PresenceData pdata = m_Database.Get(sessionID);
-                if (pdata == null)
-                    return false;
-                if (pdata.Data == null)
-                    return false;
+                PresenceData presence = m_Database.Get(sessionID);
+
+                bool success;
+                if (presence == null)
+                    success = false;
+                else
+                    success = m_Database.ReportAgent(sessionID, regionID);
 
-                return m_Database.ReportAgent(sessionID, regionID);
+                m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent{0}: session {1}, user {2}, region {3}. Previously: {4}",
+                    success ? "" : " failed",
+                    sessionID, (presence == null) ? null : presence.UserID, regionID,
+                    (presence == null) ? "not logged-in" : "region " + presence.RegionID);
+
+                return success;
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent threw exception {0}", e.StackTrace);
+                m_log.Debug(string.Format("[PRESENCE SERVICE]: ReportAgent for session {0} threw exception ", sessionID), e);
                 return false;
             }
         }
@@ -139,8 +161,7 @@ namespace OpenSim.Services.PresenceService
 
             foreach (string userIDStr in userIDs)
             {
-                PresenceData[] data = m_Database.Get("UserID",
-                        userIDStr);
+                PresenceData[] data = m_Database.Get("UserID", userIDStr);
 
                 foreach (PresenceData d in data)
                 {
@@ -158,5 +179,23 @@ namespace OpenSim.Services.PresenceService
 
             return info.ToArray();
         }
+
+        /// <summary>
+        /// Return the user's Presence. This only really works well if !AllowDuplicatePresences, but that's the default.
+        /// </summary>
+        private PresenceData GetUser(string userID)
+        {
+            PresenceData[] data = m_Database.Get("UserID", userID);
+            if (data.Length > 0)
+                return data[0];
+            else
+                return null;
+        }
+
+        private PresenceData[] GetRegionAgents(UUID regionID)
+        {
+            return m_Database.Get("RegionID", regionID.ToString());
+        }
+
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
index 3bfd1fc..9ef0ff3 100644
--- a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/SimulationService/SimulationDataService.cs
index 4759838..7a544fa 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/SimulationService/SimulationDataService.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using System.Reflection;
 using OpenSim.Services.Base;
@@ -39,7 +38,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Services.Connectors
+namespace OpenSim.Services.SimulationService
 {
     public class SimulationDataService : ServiceBase, ISimulationDataService
     {
diff --git a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
new file mode 100644
index 0000000..1808ee5
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Data;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Services.UserAccountService
+{
+    public class AgentPreferencesService : AgentPreferencesServiceBase, IAgentPreferencesService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public AgentPreferencesService(IConfigSource config) : base(config) 
+        {
+            m_log.Debug("[AGENT PREFERENCES SERVICE]: Starting agent preferences service");
+        }
+
+        public AgentPrefs GetAgentPreferences(UUID principalID)
+        {
+            AgentPreferencesData d = m_Database.GetPrefs(principalID);
+            AgentPrefs prefs = (d == null) ? new AgentPrefs(principalID) : new AgentPrefs(d.Data);
+            return prefs;
+        }
+
+        public bool StoreAgentPreferences(AgentPrefs data)
+        {
+            AgentPreferencesData d = new AgentPreferencesData();
+            d.Data = new Dictionary<string, string>();
+            d.Data["PrincipalID"] = data.PrincipalID.ToString();
+            d.Data["AccessPrefs"] = data.AccessPrefs;
+            d.Data["HoverHeight"] = data.HoverHeight.ToString();
+            d.Data["Language"] = data.Language;
+            d.Data["LanguageIsPublic"] = (data.LanguageIsPublic ? "1" : "0");
+            d.Data["PermEveryone"] = data.PermEveryone.ToString();
+            d.Data["PermGroup"] = data.PermGroup.ToString();
+            d.Data["PermNextOwner"] = data.PermNextOwner.ToString();
+            return m_Database.Store(d);
+        }
+
+        public string GetLang(UUID principalID)
+        {
+            AgentPrefs data = GetAgentPreferences(principalID);
+            if (data != null)
+            {
+                if (data.LanguageIsPublic)
+                    return data.Language;
+            }
+            return "en-us";
+        }
+    }
+}
diff --git a/OpenSim/Services/UserAccountService/AgentPreferencesServiceBase.cs b/OpenSim/Services/UserAccountService/AgentPreferencesServiceBase.cs
new file mode 100644
index 0000000..5974349
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/AgentPreferencesServiceBase.cs
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Base;
+
+namespace OpenSim.Services.UserAccountService
+{
+    public class AgentPreferencesServiceBase: ServiceBase
+    {
+        protected IAgentPreferencesData m_Database = null;
+
+        public AgentPreferencesServiceBase(IConfigSource config) : base(config)
+        {
+            string dllName = String.Empty;
+            string connString = String.Empty;
+            string realm = "AgentPrefs";
+
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
+
+            IConfig userConfig = config.Configs["AgentPreferencesService"];
+            if (userConfig == null)
+                throw new Exception("No AgentPreferencesService configuration");
+
+            dllName = userConfig.GetString("StorageProvider", dllName);
+
+            if (dllName == String.Empty)
+                throw new Exception("No StorageProvider configured");
+
+            connString = userConfig.GetString("ConnectionString", connString);
+
+            realm = userConfig.GetString("Realm", realm);
+
+            m_Database = LoadPlugin<IAgentPreferencesData>(dllName, new Object[] {connString, realm});
+
+            if (m_Database == null)
+                throw new Exception("Could not find a storage interface in the given module");
+        }
+    }
+}
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index bef1691..e4bcf15 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -43,19 +43,58 @@ namespace OpenSim.Services.UserAccountService
     public class GridUserService : GridUserServiceBase, IGridUserService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static bool m_Initialized;
 
         public GridUserService(IConfigSource config) : base(config) 
         {
             m_log.Debug("[GRID USER SERVICE]: Starting user grid service");
 
-            MainConsole.Instance.Commands.AddCommand(
-                "Users", false,
-                "show grid users online",
-                "show grid users online",
-                "Show number of grid users registered as online.", 
-                "This number may not be accurate as a region may crash or not be cleanly shutdown and leave grid users shown as online\n."
-                + "For this reason, users online for more than 5 days are not currently counted",
-                HandleShowGridUsersOnline);
+            if (!m_Initialized)
+            {
+                m_Initialized = true;
+
+                MainConsole.Instance.Commands.AddCommand(
+                    "Users", false,
+                    "show grid user",
+                    "show grid user <ID>",
+                    "Show grid user entry or entries that match or start with the given ID.  This will normally be a UUID.",
+                    "This is for debug purposes to see what data is found for a particular user id.",
+                    HandleShowGridUser);
+
+                MainConsole.Instance.Commands.AddCommand(
+                    "Users", false,
+                    "show grid users online",
+                    "show grid users online",
+                    "Show number of grid users registered as online.",
+                    "This number may not be accurate as a region may crash or not be cleanly shutdown and leave grid users shown as online\n."
+                    + "For this reason, users online for more than 5 days are not currently counted",
+                    HandleShowGridUsersOnline);
+            }
+        }
+
+        protected void HandleShowGridUser(string module, string[] cmdparams)
+        {
+            if (cmdparams.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: show grid user <UUID>");
+                return;
+            }
+
+            GridUserData[] data = m_Database.GetAll(cmdparams[3]);
+
+            foreach (GridUserData gu in data)
+            {
+                ConsoleDisplayList cdl = new ConsoleDisplayList();
+
+                cdl.AddRow("User ID", gu.UserID);
+
+                foreach (KeyValuePair<string,string> kvp in gu.Data)
+                    cdl.AddRow(kvp.Key, kvp.Value);
+
+                MainConsole.Instance.Output(cdl.ToString());
+            }
+
+            MainConsole.Instance.OutputFormat("Entries: {0}", data.Length);
         }
 
         protected void HandleShowGridUsersOnline(string module, string[] cmdparams)
@@ -87,11 +126,13 @@ namespace OpenSim.Services.UserAccountService
             MainConsole.Instance.OutputFormat("Users online: {0}", onlineRecentlyCount);
         }
 
-        public virtual GridUserInfo GetGridUserInfo(string userID)
+        private GridUserData GetGridUserData(string userID)
         {
             GridUserData d = null;
             if (userID.Length > 36) // it's a UUI
+            {
                 d = m_Database.Get(userID);
+            }
             else // it's a UUID
             {
                 GridUserData[] ds = m_Database.GetAll(userID);
@@ -107,6 +148,13 @@ namespace OpenSim.Services.UserAccountService
                 }
             }
 
+            return d;
+        }
+
+        public virtual GridUserInfo GetGridUserInfo(string userID)
+        {
+            GridUserData d = GetGridUserData(userID);
+
             if (d == null)
                 return null;
 
@@ -140,7 +188,8 @@ namespace OpenSim.Services.UserAccountService
         public GridUserInfo LoggedIn(string userID)
         {
             m_log.DebugFormat("[GRID USER SERVICE]: User {0} is online", userID);
-            GridUserData d = m_Database.Get(userID);
+
+            GridUserData d = GetGridUserData(userID);
 
             if (d == null)
             {
@@ -159,7 +208,8 @@ namespace OpenSim.Services.UserAccountService
         public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
             m_log.DebugFormat("[GRID USER SERVICE]: User {0} is offline", userID);
-            GridUserData d = m_Database.Get(userID);
+
+            GridUserData d = GetGridUserData(userID);
 
             if (d == null)
             {
@@ -178,7 +228,8 @@ namespace OpenSim.Services.UserAccountService
 
         public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
         {
-            GridUserData d = m_Database.Get(userID);
+            GridUserData d = GetGridUserData(userID);
+
             if (d == null)
             {
                 d = new GridUserData();
@@ -196,7 +247,8 @@ namespace OpenSim.Services.UserAccountService
         {
 //            m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID);
 
-            GridUserData d = m_Database.Get(userID);
+            GridUserData d = GetGridUserData(userID);
+
             if (d == null)
             {
                 d = new GridUserData();
@@ -210,4 +262,4 @@ namespace OpenSim.Services.UserAccountService
             return m_Database.Store(d);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
index 990cb63..8c5f5df 100644
--- a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
+++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs
@@ -60,12 +60,12 @@ namespace OpenSim.Services.UserAccountService
             //
             // [GridUsetService] section overrides [DatabaseService], if it exists
             //
-            IConfig presenceConfig = config.Configs["GridUserService"];
-            if (presenceConfig != null)
+            IConfig usersConfig = config.Configs["GridUserService"];
+            if (usersConfig != null)
             {
-                dllName = presenceConfig.GetString("StorageProvider", dllName);
-                connString = presenceConfig.GetString("ConnectionString", connString);
-                realm = presenceConfig.GetString("Realm", realm);
+                dllName = usersConfig.GetString("StorageProvider", dllName);
+                connString = usersConfig.GetString("ConnectionString", connString);
+                realm = usersConfig.GetString("Realm", realm);
             }
             
             //
diff --git a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
index 16ae6bd..33933a0 100644
--- a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 772ab97..987a07d 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -98,7 +98,12 @@ namespace OpenSim.Services.UserAccountService
                 MainConsole.Instance.Commands.AddCommand("Users", false,
                         "reset user password",
                         "reset user password [<first> [<last> [<password>]]]",
-                        "Reset a user password", HandleResetUserPassword);
+                    "Reset a user password", HandleResetUserPassword);
+
+                MainConsole.Instance.Commands.AddCommand("Users", false,
+                    "reset user email",
+                    "reset user email [<first> [<last> [<email>]]]",
+                    "Reset a user email address", HandleResetUserEmail);
 
                 MainConsole.Instance.Commands.AddCommand("Users", false,
                         "set user level",
@@ -260,6 +265,10 @@ namespace OpenSim.Services.UserAccountService
             return MakeUserAccount(d[0]);
         }
 
+        public void InvalidateCache(UUID userID)
+        {
+        }
+
         public bool StoreUserAccount(UserAccount data)
         {
 //            m_log.DebugFormat(
@@ -435,6 +444,43 @@ namespace OpenSim.Services.UserAccountService
                 MainConsole.Instance.OutputFormat("Password reset for user {0} {1}", firstName, lastName);
         }
 
+        protected void HandleResetUserEmail(string module, string[] cmdparams)
+        {
+            string firstName;
+            string lastName;
+            string newEmail;
+
+            if (cmdparams.Length < 4)
+                firstName = MainConsole.Instance.CmdPrompt("First name");
+            else firstName = cmdparams[3];
+
+            if (cmdparams.Length < 5)
+                lastName = MainConsole.Instance.CmdPrompt("Last name");
+            else lastName = cmdparams[4];
+
+            if (cmdparams.Length < 6)
+                newEmail = MainConsole.Instance.PasswdPrompt("New Email");
+            else newEmail = cmdparams[5];
+
+            UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
+            if (account == null)
+            {
+                MainConsole.Instance.OutputFormat("No such user as {0} {1}", firstName, lastName);
+                return;
+            }
+
+            bool success = false;
+
+            account.Email = newEmail;
+
+            success = StoreUserAccount(account);
+            if (!success)
+                MainConsole.Instance.OutputFormat("Unable to set Email for account {0} {1}.", firstName, lastName);
+            else
+                MainConsole.Instance.OutputFormat("User Email set for user {0} {1} to {2}", firstName, lastName, account.Email);
+        }
+
+
         protected void HandleSetUserLevel(string module, string[] cmdparams)
         {
             string firstName;
@@ -495,7 +541,6 @@ namespace OpenSim.Services.UserAccountService
                 {
                     account.ServiceURLs = new Dictionary<string, object>();
                     account.ServiceURLs["HomeURI"] = string.Empty;
-                    account.ServiceURLs["GatekeeperURI"] = string.Empty;
                     account.ServiceURLs["InventoryServerURI"] = string.Empty;
                     account.ServiceURLs["AssetServerURI"] = string.Empty;
                 }
@@ -569,7 +614,7 @@ namespace OpenSim.Services.UserAccountService
         {
             m_log.DebugFormat("[USER ACCOUNT SERVICE]: Creating default appearance items for {0}", principalID);
 
-            InventoryFolderBase bodyPartsFolder = m_InventoryService.GetFolderForType(principalID, AssetType.Bodypart);
+            InventoryFolderBase bodyPartsFolder = m_InventoryService.GetFolderForType(principalID, FolderType.BodyPart);
 
             InventoryItemBase eyes = new InventoryItemBase(UUID.Random(), principalID);
             eyes.AssetID = new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7");
@@ -631,7 +676,7 @@ namespace OpenSim.Services.UserAccountService
             hair.Flags = (uint)WearableType.Hair;
             m_InventoryService.AddItem(hair);
 
-            InventoryFolderBase clothingFolder = m_InventoryService.GetFolderForType(principalID, AssetType.Clothing);
+            InventoryFolderBase clothingFolder = m_InventoryService.GetFolderForType(principalID, FolderType.Clothing);
 
             InventoryItemBase shirt = new InventoryItemBase(UUID.Random(), principalID);
             shirt.AssetID = AvatarWearable.DEFAULT_SHIRT_ASSET;
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 038e993..35fe31b 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -37,7 +37,6 @@ using OpenSim.Data;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
-using OpenSim.Services.UserAccountService;
 
 namespace OpenSim.Services.ProfilesService
 {
@@ -48,7 +47,6 @@ namespace OpenSim.Services.ProfilesService
                 MethodBase.GetCurrentMethod().DeclaringType);
         
         IUserAccountService userAccounts;
-        IAuthenticationService authService;
 
         public UserProfilesService(IConfigSource config, string configName):
             base(config, configName)
@@ -56,7 +54,7 @@ namespace OpenSim.Services.ProfilesService
             IConfig Config = config.Configs[configName];
             if (Config == null)
             {
-                m_log.Warn("[PROFILES]: No configuration found!");
+                m_log.Warn("[PROFILES SERVICE]: No configuration found!");
                 return;
             }
             Object[] args = null;
@@ -67,9 +65,6 @@ namespace OpenSim.Services.ProfilesService
                 userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
             
             args = new Object[] { config };
-            string authServiceConfig = Config.GetString("AuthenticationServiceModule", String.Empty);
-            if (accountService != string.Empty)
-                authService = ServerUtils.LoadPlugin<IAuthenticationService>(authServiceConfig, args);
         }
         
         #region Classifieds
@@ -178,23 +173,22 @@ namespace OpenSim.Services.ProfilesService
                         account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
                         if(string.IsNullOrEmpty(account.Email))
                         {
-                            result = "No Email address on record!";
-                            return false;
+                            pref.EMail = string.Empty;
                         }
                         else
                             pref.EMail = account.Email;
                     }
                     catch
                     {
-                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
-                        result = "Missing Email address!";
+                        m_log.Error ("[PROFILES SERVICE]: UserAccountService Exception: Could not get user account");
+                        result = "UserAccountService settings error in UserProfileService!";
                         return false;
                     }
                 }
                 else
                 {
-                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
-                    result = "Missing Email address!";
+                    m_log.Error ("[PROFILES SERVICE]: UserAccountService: Could not get user account");
+                    result = "UserAccountService settings error in UserProfileService!";
                     return false;
                 }
             }
@@ -203,6 +197,9 @@ namespace OpenSim.Services.ProfilesService
 
         public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
         {
+            if (!ProfilesData.GetUserPreferences(ref pref, ref result))
+                return false;
+
             if(string.IsNullOrEmpty(pref.EMail))
             {
                 UserAccount account = new UserAccount();
@@ -213,27 +210,33 @@ namespace OpenSim.Services.ProfilesService
                         account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
                         if(string.IsNullOrEmpty(account.Email))
                         {
-                            result = "No Email address on record!";
-                            return false;
+                            pref.EMail = string.Empty;
                         }
                         else
+                        {
                             pref.EMail = account.Email;
+                            UserPreferencesUpdate(ref pref, ref result);
+                        }
                     }
                     catch
                     {
-                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
-                        result = "Missing Email address!";
+                        m_log.Error ("[PROFILES SERVICE]: UserAccountService Exception: Could not get user account");
+                        result = "UserAccountService settings error in UserProfileService!";
                         return false;
                     }
                 }
                 else
                 {
-                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
-                    result = "Missing Email address!";
+                    m_log.Error ("[PROFILES SERVICE]: UserAccountService: Could not get user account");
+                    result = "UserAccountService settings error in UserProfileService!";
                     return false;
                 }
             }
-            return ProfilesData.GetUserPreferences(ref pref, ref result);
+
+            if(string.IsNullOrEmpty(pref.EMail))
+                pref.EMail = "No Email Address On Record";
+
+            return true;
         }
         #endregion User Preferences
         */
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
index 927f7c9..c31578f 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Services.ProfilesService
         {
             if(string.IsNullOrEmpty(configName))
             {
-                m_log.WarnFormat("[PROFILES]: Configuration section not given!");
+                m_log.WarnFormat("[PROFILES SERVICE]: Configuration section not given!");
                 return;
             }
 
@@ -72,6 +72,7 @@ namespace OpenSim.Services.ProfilesService
             IConfig ProfilesConfig = config.Configs[configName];
             if (ProfilesConfig != null)
             {
+                dllName = ProfilesConfig.GetString("StorageProvider", dllName);
                 connString = ProfilesConfig.GetString("ConnectionString", connString);
                 realm = ProfilesConfig.GetString("Realm", realm);
             }