70 files changed, 5272 insertions, 1540 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 6fd3d30..1e85a22 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -102,8 +102,6 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
            m_log.Info("[LOADREGIONSPLUGIN]: Loading specific shared modules...");
            m_log.Info("[LOADREGIONSPLUGIN]: DynamicTextureModule...");
            m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
-            m_log.Info("[LOADREGIONSPLUGIN]: InstantMessageModule...");
-            m_openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule());
            m_log.Info("[LOADREGIONSPLUGIN]: LoadImageURLModule...");
            m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
            m_log.Info("[LOADREGIONSPLUGIN]: XMLRPCModule...");
@@ -217,4 +215,4 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
            }
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 6c0c74d..2e883d6 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -65,9 +65,13 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
        public void Initialise (OpenSimBase openSim)
        {
-            m_log.DebugFormat("[REGIONMODULES]: Initializing...");
            m_openSim = openSim;
-            openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this);
+        }
+        public void PostInitialise ()
+        {
+            m_log.DebugFormat("[REGIONMODULES]: Initializing...");
+            m_openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this);
            // Who we are
            string id = AddinManager.CurrentAddin.Id;
@@ -81,9 +85,9 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            // The [Modules] section in the ini file
            IConfig modulesConfig =
-                    openSim.ConfigSource.Source.Configs["Modules"];
+                    m_openSim.ConfigSource.Source.Configs["Modules"];
            if (modulesConfig == null)
-                modulesConfig = openSim.ConfigSource.Source.AddConfig("Modules");
+                modulesConfig = m_openSim.ConfigSource.Source.AddConfig("Modules");
            // Scan modules and load all that aren't disabled
            foreach (TypeExtensionNode node in
@@ -195,7 +199,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                // OK, we're up and running
                m_sharedInstances.Add(module);
-                module.Initialise(openSim.ConfigSource.Source);
+                module.Initialise(m_openSim.ConfigSource.Source);
            }
            // Immediately run PostInitialise on shared modules
@@ -205,10 +209,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            }
        }
-        public void PostInitialise ()
-        {
-        }
 #endregion
 #region IPlugin implementation
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index 122110d..a975fa2 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -37,6 +37,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Services;
+using LoginResponse = OpenSim.Framework.Communications.Services.LoginResponse;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index e5a8ebd..71d0e31 100644
--- a/OpenSim/Data/IPresenceData.cs
+++ b/OpenSim/Data/IPresenceData.cs
@@ -32,25 +32,28 @@ using OpenSim.Framework;
 namespace OpenSim.Data
 {
-    public struct PresenceData
+    // This MUST be a ref type!
+    public class PresenceData
    {
-        public UUID UUID;
+        public string UserID;
-        public UUID currentRegion;
+        public UUID RegionID;
+        public UUID SessionID;
        public Dictionary<string, string> Data;
    }
    /// <summary>
-    /// An interface for connecting to the authentication datastore
+    /// An interface for connecting to the presence datastore
    /// </summary>
    public interface IPresenceData 
    {
        bool Store(PresenceData data);
-        PresenceData Get(UUID principalID);
+        PresenceData Get(UUID sessionID);
+        void LogoutRegionAgents(UUID regionID);
-        bool SetUserDataItem(UUID principalID, string item, string value);
+        bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt);
-        bool SetRegionDataItem(UUID principalID, string item, string value);
+        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
+        PresenceData[] Get(string field, string data);
-        bool Delete(UUID regionID);
+        void Prune(string userID);
+        bool Delete(string field, string val);
    }
 }
diff --git a/OpenSim/Data/IUserAccountData.cs b/OpenSim/Data/IUserAccountData.cs
index 6bec188..6ee5995 100644
--- a/OpenSim/Data/IUserAccountData.cs
+++ b/OpenSim/Data/IUserAccountData.cs
@@ -36,20 +36,18 @@ namespace OpenSim.Data
    {
        public UUID PrincipalID;
        public UUID ScopeID;
-        public Dictionary<string, object> Data;
+        public string FirstName;
+        public string LastName;
+        public Dictionary<string, string> Data;
    }
    /// <summary>
-    /// An interface for connecting to the authentication datastore
+    /// An interface for connecting to the user accounts datastore
    /// </summary>
    public interface IUserAccountData
    {
-        UserAccountData Get(UUID principalID, UUID ScopeID);
+        UserAccountData[] Get(string[] fields, string[] values);
-        List<UserAccountData> Query(UUID principalID, UUID ScopeID, string query);
        bool Store(UserAccountData data);
+        UserAccountData[] GetUsers(UUID scopeID, string query);
-        bool SetDataItem(UUID principalID, string item, string value);
    }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 2d92cb1..01c64dc 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Data.MSSQL
        public UserAccountData Get(UUID principalID, UUID scopeID)
        {
            UserAccountData ret = new UserAccountData();
-            ret.Data = new Dictionary<string, object>();
+            ret.Data = new Dictionary<string, string>();
            string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
            if (scopeID != UUID.Zero)
@@ -168,6 +168,11 @@ namespace OpenSim.Data.MSSQL
            return true;
        }
+        public bool Store(UserAccountData data, UUID principalID, string token)
+        {
+            return false;
+        }
        public bool SetDataItem(UUID principalID, string item, string value)
        {
            string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
@@ -184,5 +189,15 @@ namespace OpenSim.Data.MSSQL
            }
            return false;
        }
+        public UserAccountData[] Get(string[] keys, string[] vals)
+        {
+            return null;
+        }
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
+        {
+            return null;
+        }
    }
 }
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index e51dc22..5a9b01b 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -138,7 +138,14 @@ namespace OpenSim.Data
                cmd.CommandText = kvp.Value;
                // we need to up the command timeout to infinite as we might be doing long migrations.
                cmd.CommandTimeout = 0;
-                cmd.ExecuteNonQuery();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Debug("[MIGRATIONS]: An error has occurred in the migration. This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.");
+                }
                if (version == 0)
                {
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index b2bd5f6..873d6d4 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -177,6 +177,8 @@ namespace OpenSim.Data.MySQL
                result.Add(row);
            }
+            reader.Close();
            CloseReaderCommand(cmd);
            return result.ToArray();
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
new file mode 100644
index 0000000..72b8a0c
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -0,0 +1,149 @@
+/*
+ * 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.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+namespace OpenSim.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Interface for the Grid Server
+    /// </summary>
+    public class MySQLPresenceData : MySQLGenericTableHandler<PresenceData>,
+            IPresenceData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public MySQLPresenceData(string connectionString, string realm) :
+                base(connectionString, realm, "Presence")
+        {
+        }
+        public PresenceData Get(UUID sessionID)
+        {
+            PresenceData[] ret = Get("SessionID",
+                    sessionID.ToString());
+            if (ret.Length == 0)
+                return null;
+            return ret[0];
+        }
+        public void LogoutRegionAgents(UUID regionID)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+            cmd.CommandText = String.Format("update {0} set Online='false' where `RegionID`=?RegionID", m_Realm);
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+            ExecuteNonQuery(cmd);
+        }
+        public bool ReportAgent(UUID sessionID, UUID regionID, string position,
+                string lookAt)
+        {
+            PresenceData[] pd = Get("SessionID", sessionID.ToString());
+            if (pd.Length == 0)
+                return false;
+            MySqlCommand cmd = new MySqlCommand();
+            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, Position=?Position, LookAt=?LookAt', Online='true' where `SessionID`=?SessionID", m_Realm);
+            cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+            cmd.Parameters.AddWithValue("?Position", position);
+            cmd.Parameters.AddWithValue("?LookAt", lookAt);
+            if (ExecuteNonQuery(cmd) == 0)
+                return false;
+            return true;
+        }
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            PresenceData[] pd = Get("UserID", userID);
+            if (pd.Length == 0)
+                return false;
+            MySqlCommand cmd = new MySqlCommand();
+            cmd.CommandText = String.Format("update {0} set HomeRegionID=?HomeRegionID, HomePosition=?HomePosition, HomeLookAt=?HomeLookAt where UserID=?UserID", m_Realm);
+            cmd.Parameters.AddWithValue("?UserID", userID);
+            cmd.Parameters.AddWithValue("?HomeRegionID", regionID.ToString());
+            cmd.Parameters.AddWithValue("?HomePosition", position);
+            cmd.Parameters.AddWithValue("?HomeLookAt", lookAt);
+            if (ExecuteNonQuery(cmd) == 0)
+                return false;
+            return true;
+        }
+        public void Prune(string userID)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+            cmd.CommandText = String.Format("select * from {0} where UserID=?UserID", m_Realm);
+            cmd.Parameters.AddWithValue("?UserID", userID);
+            IDataReader reader = ExecuteReader(cmd);
+            List<UUID> deleteSessions = new List<UUID>();
+            int online = 0;
+            while(reader.Read())
+            {
+                if (bool.Parse(reader["Online"].ToString()))
+                    online++;
+                else
+                    deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
+            }
+            if (online == 0 && deleteSessions.Count > 0)
+                deleteSessions.RemoveAt(0);
+            reader.Close();
+            CloseReaderCommand(cmd);
+            foreach (UUID s in deleteSessions)
+                Delete("SessionID", s.ToString());
+        }
+    }
+}
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index d48144d..aa69d68 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -35,146 +35,50 @@ using MySql.Data.MySqlClient;
 namespace OpenSim.Data.MySQL
 {
-    public class MySqlUserAccountData : MySqlFramework, IUserAccountData
+    public class MySqlUserAccountData : MySQLGenericTableHandler<UserAccountData>, IUserAccountData
    {
-        private string m_Realm;
-        private List<string> m_ColumnNames = null;
-//        private int m_LastExpire = 0;
        public MySqlUserAccountData(string connectionString, string realm)
-                : base(connectionString)
+                : base(connectionString, realm, "UserAccount")
-        {
-            m_Realm = realm;
-            Migration m = new Migration(m_Connection, GetType().Assembly, "UserStore");
-            m.Update();
-        }
-        public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
        {
-            return null;
        }
-        public UserAccountData Get(UUID principalID, UUID scopeID)
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
        {
-            UserAccountData ret = new UserAccountData();
+            string[] words = query.Split(new char[] {' '});
-            ret.Data = new Dictionary<string, object>();
-            string command = "select * from `"+m_Realm+"` where UUID = ?principalID";
+            for (int i = 0 ; i < words.Length ; i++)
-            if (scopeID != UUID.Zero)
-                command += " and ScopeID = ?scopeID";
-            MySqlCommand cmd = new MySqlCommand(command);
-            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-            IDataReader result = ExecuteReader(cmd);
-            if (result.Read())
            {
-                ret.PrincipalID = principalID;
+                if (words[i].Length < 3)
-                UUID scope;
-                UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                ret.ScopeID = scope;
-                if (m_ColumnNames == null)
                {
-                    m_ColumnNames = new List<string>();
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
-                    DataTable schemaTable = result.GetSchemaTable();
+                    Array.Resize(ref words, words.Length - 1);
-                    foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
-                }
-                foreach (string s in m_ColumnNames)
-                {
-                    if (s == "UUID")
-                        continue;
-                    if (s == "ScopeID")
-                        continue;
-                    ret.Data[s] = result[s].ToString();
                }
-                result.Close();
-                CloseReaderCommand(cmd);
-                return ret;
            }
-            result.Close();
+            if (words.Length == 0)
-            CloseReaderCommand(cmd);
+                return new UserAccountData[0];
-            return null;
+            if (words.Length > 2)
-        }
+                return new UserAccountData[0];
-        public bool Store(UserAccountData data)
-        {
-            if (data.Data.ContainsKey("UUID"))
-                data.Data.Remove("UUID");
-            if (data.Data.ContainsKey("ScopeID"))
-                data.Data.Remove("ScopeID");
-            string[] fields = new List<string>(data.Data.Keys).ToArray();
            MySqlCommand cmd = new MySqlCommand();
-            string update = "update `"+m_Realm+"` set ";
+            if (words.Length == 1)
-            bool first = true;
-            foreach (string field in fields)
            {
-                if (!first)
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
-                    update += ", ";
+                cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
-                update += "`" + field + "` = ?"+field;
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                first = false;
-                cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
            }
+            else
-            update += " where UUID = ?principalID";
-            if (data.ScopeID != UUID.Zero)
-                update += " and ScopeID = ?scopeID";
-            cmd.CommandText = update;
-            cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
-            cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
-            if (ExecuteNonQuery(cmd) < 1)
            {
-                string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
-                        String.Join("`, `", fields) +
+                cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
-                        "`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
+                cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                cmd.CommandText = insert;
-                if (ExecuteNonQuery(cmd) < 1)
-                {
-                    cmd.Dispose();
-                    return false;
-                }
            }
-            cmd.Dispose();
+            return DoQuery(cmd);
-            return true;
-        }
-        public bool SetDataItem(UUID principalID, string item, string value)
-        {
-            MySqlCommand cmd = new MySqlCommand("update `" + m_Realm +
-                    "` set `" + item + "` = ?" + item + " where UUID = ?UUID");
-            cmd.Parameters.AddWithValue("?"+item, value);
-            cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
-            if (ExecuteNonQuery(cmd) > 0)
-                return true;
-            return false;
        }
    }
 }
diff --git a/OpenSim/Data/MySQL/Resources/001_Friends.sql b/OpenSim/Data/MySQL/Resources/001_Friends.sql
new file mode 100644
index 0000000..e158a2c
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_Friends.sql
@@ -0,0 +1,9 @@
+BEGIN;
+CREATE TABLE `Friends` (
+    `PrincipalID` CHAR(36) NOT NULL,
+    `FriendID` VARCHAR(255) NOT NULL,
+    `Flags` CHAR(16) NOT NULL DEFAULT '0'
+) ENGINE=InnoDB;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/001_Presence.sql b/OpenSim/Data/MySQL/Resources/001_Presence.sql
new file mode 100644
index 0000000..b8abaf7
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_Presence.sql
@@ -0,0 +1,15 @@
+BEGIN;
+CREATE TABLE `Presence` (
+    `UserID` VARCHAR(255) NOT NULL,
+    `RegionID` CHAR(36) NOT NULL,
+    `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `Online` CHAR(5) NOT NULL DEFAULT 'false',
+    `Login` CHAR(16) NOT NULL DEFAULT '0',
+    `Logout` CHAR(16) NOT NULL DEFAULT '0',
+    `Position` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    `LookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>'
+) ENGINE=InnoDB;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/001_UserAccount.sql b/OpenSim/Data/MySQL/Resources/001_UserAccount.sql
new file mode 100644
index 0000000..07da571
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_UserAccount.sql
@@ -0,0 +1,13 @@
+BEGIN;
+CREATE TABLE `UserAccounts` (
+    `PrincipalID` CHAR(36) NOT NULL,
+    `ScopeID` CHAR(36) NOT NULL,
+    `FirstName` VARCHAR(64) NOT NULL,
+    `LastName` VARCHAR(64) NOT NULL,
+    `Email` VARCHAR(64),
+    `ServiceURLs` TEXT,
+    `Created` INT(11)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_Friends.sql b/OpenSim/Data/MySQL/Resources/002_Friends.sql
new file mode 100644
index 0000000..5ff6438
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_Friends.sql
@@ -0,0 +1,5 @@
+BEGIN;
+INSERT INTO Friends (PrincipalID, FriendID, Flags) SELECT ownerID, friendID, friendPerms FROM userfriends;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_Presence.sql b/OpenSim/Data/MySQL/Resources/002_Presence.sql
new file mode 100644
index 0000000..e65f105
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_Presence.sql
@@ -0,0 +1,7 @@
+BEGIN;
+ALTER TABLE Presence ADD COLUMN `HomeRegionID` CHAR(36) NOT NULL;
+ALTER TABLE Presence ADD COLUMN `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
+ALTER TABLE Presence ADD COLUMN `HomeLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_UserAccount.sql b/OpenSim/Data/MySQL/Resources/002_UserAccount.sql
new file mode 100644
index 0000000..ad2ddda
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_UserAccount.sql
@@ -0,0 +1,5 @@
+BEGIN;
+INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT `UUID` AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, username AS FirstName, lastname AS LastName, email as Email, CONCAT('AssetServerURI=', userAssetURI, ' InventoryServerURI=', userInventoryURI, ' GatewayURI= HomeURI=') AS ServiceURLs, created as Created FROM users;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_Presence.sql b/OpenSim/Data/MySQL/Resources/003_Presence.sql
new file mode 100644
index 0000000..0efefa8
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/003_Presence.sql
@@ -0,0 +1,6 @@
+BEGIN;
+CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
+CREATE INDEX UserID ON Presence(UserID);
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_UserAccount.sql b/OpenSim/Data/MySQL/Resources/003_UserAccount.sql
new file mode 100644
index 0000000..e42d93b
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/003_UserAccount.sql
@@ -0,0 +1,9 @@
+BEGIN;
+CREATE UNIQUE INDEX PrincipalID ON UserAccounts(PrincipalID);
+CREATE INDEX Email ON UserAccounts(Email);
+CREATE INDEX FirstName ON UserAccounts(FirstName);
+CREATE INDEX LastName ON UserAccounts(LastName);
+CREATE INDEX Name ON UserAccounts(FirstName,LastName);
+COMMIT;
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
new file mode 100644
index 0000000..52fdc6f
--- /dev/null
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -0,0 +1,223 @@
+/*
+ * 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 OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
+namespace OpenSim.Data.Null
+{
+    public class NullPresenceData : IPresenceData
+    {
+        Dictionary<UUID, PresenceData> m_presenceData = new Dictionary<UUID, PresenceData>();
+        public NullPresenceData(string connectionString, string realm)
+        {
+            //Console.WriteLine("[XXX] NullRegionData constructor");
+            // Let's stick in a test presence
+            PresenceData p = new PresenceData();
+            p.SessionID = UUID.Zero;
+            p.UserID = UUID.Zero.ToString();
+            p.Data = new Dictionary<string, string>();
+            p.Data["Online"] = "true";
+            m_presenceData.Add(UUID.Zero, p);
+        }
+        public bool Store(PresenceData data)
+        {
+            m_presenceData[data.SessionID] = data;
+            return true;
+        }
+        public PresenceData Get(UUID sessionID)
+        {
+            if (m_presenceData.ContainsKey(sessionID))
+                return m_presenceData[sessionID];
+            return null;
+        }
+        public void LogoutRegionAgents(UUID regionID)
+        {
+            List<UUID> toBeDeleted = new List<UUID>();
+            foreach (KeyValuePair<UUID, PresenceData> kvp in m_presenceData)
+                if (kvp.Value.RegionID == regionID)
+                    toBeDeleted.Add(kvp.Key);
+            foreach (UUID u in toBeDeleted)
+                m_presenceData.Remove(u);
+        }
+        public bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt)
+        {
+            if (m_presenceData.ContainsKey(sessionID))
+            {
+                m_presenceData[sessionID].RegionID = regionID;
+                m_presenceData[sessionID].Data["Position"] = position;
+                m_presenceData[sessionID].Data["LookAt"] = lookAt;
+                return true;
+            }
+            return false;
+        }
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            bool foundone = false;
+            foreach (PresenceData p in m_presenceData.Values)
+            {
+                if (p.UserID == userID)
+                {
+                    p.Data["HomeRegionID"] = regionID.ToString();
+                    p.Data["HomePosition"] = position.ToString();
+                    p.Data["HomeLookAt"] = lookAt.ToString();
+                    foundone = true;
+                }
+            }
+            return foundone;
+        }
+        public PresenceData[] Get(string field, string data)
+        {
+            List<PresenceData> presences = new List<PresenceData>();
+            if (field == "UserID")
+            {
+                foreach (PresenceData p in m_presenceData.Values)
+                    if (p.UserID == data)
+                        presences.Add(p);
+                return presences.ToArray();
+            }
+            else if (field == "SessionID")
+            {
+                UUID session = UUID.Zero;
+                if (!UUID.TryParse(data, out session))
+                    return presences.ToArray();
+                if (m_presenceData.ContainsKey(session))
+                {
+                    presences.Add(m_presenceData[session]);
+                    return presences.ToArray();
+                }
+            }
+            else if (field == "RegionID")
+            {
+                UUID region = UUID.Zero;
+                if (!UUID.TryParse(data, out region))
+                    return presences.ToArray();
+                foreach (PresenceData p in m_presenceData.Values)
+                    if (p.RegionID == region)
+                        presences.Add(p);
+                return presences.ToArray();
+            }
+            else
+            {
+                foreach (PresenceData p in m_presenceData.Values)
+                {
+                    if (p.Data.ContainsKey(field) && p.Data[field] == data)
+                        presences.Add(p);
+                }
+                return presences.ToArray();
+            }
+            return presences.ToArray();
+        }
+        public void Prune(string userID)
+        {
+            List<UUID> deleteSessions = new List<UUID>();
+            int online = 0;
+            foreach (KeyValuePair<UUID, PresenceData> kvp in m_presenceData)
+            {
+                bool on = false;
+                if (bool.TryParse(kvp.Value.Data["Online"], out on) && on)
+                    online++;
+                else
+                    deleteSessions.Add(kvp.Key);
+            }
+            if (online == 0 && deleteSessions.Count > 0)
+                deleteSessions.RemoveAt(0);
+            foreach (UUID s in deleteSessions)
+                m_presenceData.Remove(s);
+        }
+        public bool Delete(string field, string data)
+        {
+            List<UUID> presences = new List<UUID>();
+            if (field == "UserID")
+            {
+                foreach (KeyValuePair<UUID, PresenceData> p in m_presenceData)
+                    if (p.Value.UserID == data)
+                        presences.Add(p.Key);
+            }
+            else if (field == "SessionID")
+            {
+                UUID session = UUID.Zero;
+                if (UUID.TryParse(data, out session))
+                {
+                    if (m_presenceData.ContainsKey(session))
+                    {
+                        presences.Add(session);
+                    }
+                }
+            }
+            else if (field == "RegionID")
+            {
+                UUID region = UUID.Zero;
+                if (UUID.TryParse(data, out region))
+                {
+                    foreach (KeyValuePair<UUID, PresenceData> p in m_presenceData)
+                        if (p.Value.RegionID == region)
+                            presences.Add(p.Key);
+                }
+            }
+            else
+            {
+                foreach (KeyValuePair<UUID, PresenceData> p in m_presenceData)
+                {
+                    if (p.Value.Data.ContainsKey(field) && p.Value.Data[field] == data)
+                        presences.Add(p.Key);
+                }
+            }
+            foreach (UUID u in presences)
+                m_presenceData.Remove(u);
+            if (presences.Count == 0)
+                return false;
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index 5ceaf39..ee7dec8 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Communications.Clients
            }
            // Add the regionhandle of the destination region
            ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
+            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
            args["teleport_flags"] = OSD.FromString(teleportFlags.ToString());
            string strBuffer = "";
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 8067052..27b3d47 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Framework
        float TimeDilation { get; }
+        bool AllowScriptCrossings { get; }
        event restart OnRestart;
        void AddNewClient(IClientAPI client);
@@ -96,5 +98,7 @@ namespace OpenSim.Framework
        void StackModuleInterface<M>(M mod);
        void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback);
+        ISceneObject DeserializeObject(string representation);
    }
 }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 7215086..234021c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1186,6 +1186,33 @@ namespace OpenSim.Framework
            return null;
        }
+        public static OSDMap GetOSDMap(string data)
+        {
+            OSDMap args = null;
+            try
+            {
+                OSD buffer;
+                // We should pay attention to the content-type, but let's assume we know it's Json
+                buffer = OSDParser.DeserializeJson(data);
+                if (buffer.Type == OSDType.Map)
+                {
+                    args = (OSDMap)buffer;
+                    return args;
+                }
+                else
+                {
+                    // uh?
+                    m_log.Debug(("[UTILS]: Got OSD of unexpected type " + buffer.Type.ToString()));
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Debug("[UTILS]: exception on GetOSDMap " + ex.Message);
+                return null;
+            }
+        }
        public static string[] Glob(string path)
        {
            string vol=String.Empty;
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index d46ff9b..fb808ca 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -39,6 +39,7 @@ using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Services;
+using LoginResponse = OpenSim.Framework.Communications.Services.LoginResponse;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 580e06f..fceca8e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -44,109 +44,14 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
-    /*
+    public class FriendsModule : ISharedRegionModule, IFriendsModule
-        This module handles adding/removing friends, and the the presence
-        notification process for login/logoff of friends.
-        The presence notification works as follows:
-        - After the user initially connects to a region (so we now have a UDP
-          connection to work with), this module fetches the friends of user
-          (those are cached), their on-/offline status, and info about the
-          region they are in from the MessageServer.
-        - (*) It then informs the user about the on-/offline status of her friends.
-        - It then informs all online friends currently on this region-server about
-          user's new online status (this will save some network traffic, as local
-          messages don't have to be transferred inter-region, and it will be all
-          that has to be done in Standalone Mode).
-        - For the rest of the online friends (those not on this region-server),
-          this module uses the provided region-information to map users to
-          regions, and sends one notification to every region containing the
-          friends to inform on that server.
-        - The region-server will handle that in the following way:
-          - If it finds the friend, it informs her about the user being online.
-          - If it doesn't find the friend (maybe she TPed away in the meantime),
-            it stores that information.
-          - After it processed all friends, it returns the list of friends it
-            couldn't find.
-        - If this list isn't empty, the FriendsModule re-requests information
-          about those online friends that have been missed and starts at (*)
-          again until all friends have been found, or until it tried 3 times
-          (to prevent endless loops due to some uncaught error).
-        NOTE: Online/Offline notifications don't need to be sent on region change.
-        We implement two XMLRpc handlers here, handling all the inter-region things
-        we have to handle:
-        - On-/Offline-Notifications (bulk)
-        - Terminate Friendship messages (single)
-     */
-    public class FriendsModule : IRegionModule, IFriendsModule
    {
-        private class Transaction
+        public void Initialise(IConfigSource config)
        {
-            public UUID agentID;
-            public string agentName;
-            public uint count;
-            public Transaction(UUID agentID, string agentName)
-            {
-                this.agentID = agentID;
-                this.agentName = agentName;
-                this.count = 1;
-            }
-        }
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private Cache m_friendLists = new Cache(CacheFlags.AllowUpdate);
-        private Dictionary<UUID, ulong> m_rootAgents = new Dictionary<UUID, ulong>();
-        private Dictionary<UUID, UUID> m_pendingCallingcardRequests = new Dictionary<UUID,UUID>();
-        private Scene m_initialScene; // saves a lookup if we don't have a specific scene
-        private Dictionary<ulong, Scene> m_scenes = new Dictionary<ulong,Scene>();
-        private IMessageTransferModule m_TransferModule = null;
-        private IGridService m_gridServices = null;
-        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
-        {
-            lock (m_scenes)
-            {
-                if (m_scenes.Count == 0)
-                {
-                    MainServer.Instance.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
-                    MainServer.Instance.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
-                    m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0);  // store entries for one hour max
-                    m_initialScene = scene;
-                }
-                if (!m_scenes.ContainsKey(scene.RegionInfo.RegionHandle))
-                    m_scenes[scene.RegionInfo.RegionHandle] = scene;
-            }
-            
-            scene.RegisterModuleInterface<IFriendsModule>(this);
-            
-            scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-            scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
-            scene.EventManager.OnMakeChildAgent += MakeChildAgent;
-            scene.EventManager.OnClientClosed += ClientClosed;
        }
        public void PostInitialise()
        {
-            if (m_scenes.Count > 0)
-            {
-                m_TransferModule = m_initialScene.RequestModuleInterface<IMessageTransferModule>();
-                m_gridServices = m_initialScene.GridService;
-            }
-            if (m_TransferModule == null)
-                m_log.Error("[FRIENDS]: Unable to find a message transfer module, friendship offers will not work");
        }
        public void Close()
@@ -674,448 +579,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                // ... and add the calling card
                CreateCallingCard(initiator.ControllingClient, fromAgentID, folder.ID, fromName);
            }
+>>>>>>> master:OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
        }
-        private void OnApproveFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
+        public void AddRegion(Scene scene)
-        {
-            m_log.DebugFormat("[FRIEND]: Got approve friendship from {0} {1}, agentID {2}, tid {3}",
-                              client.Name, client.AgentId, agentID, friendID);
-            // store the new friend persistently for both avatars
-            m_initialScene.StoreAddFriendship(friendID, agentID, (uint) FriendRights.CanSeeOnline);
-            // The cache entries aren't valid anymore either, as we just added a friend to both sides.
-            lock (m_friendLists)
-            {
-                m_friendLists.Invalidate(agentID.ToString());
-                m_friendLists.Invalidate(friendID.ToString());
-            }
-            // if it's a local friend, we don't have to do the lookup
-            ScenePresence friendPresence = GetAnyPresenceFromAgentID(friendID);
-            if (friendPresence != null)
-            {
-                m_log.Debug("[FRIEND]: Local agent detected.");
-                // create calling card
-                CreateCallingCard(client, friendID, callingCardFolders[0], friendPresence.Name);
-                // local message means OnGridInstantMessage won't be triggered, so do the work here.
-                friendPresence.ControllingClient.SendInstantMessage(
-                        new GridInstantMessage(client.Scene, agentID,
-                        client.Name, friendID,
-                        (byte)InstantMessageDialog.FriendshipAccepted,
-                        agentID.ToString(), false, Vector3.Zero));
-                ApproveFriendship(agentID, friendID, client.Name);
-            }
-            else
-            {
-                m_log.Debug("[FRIEND]: Remote agent detected.");
-                // fetch the friend's name for the calling card.
-                CachedUserInfo info = m_initialScene.CommsManager.UserProfileCacheService.GetUserDetails(friendID);
-                // create calling card
-                CreateCallingCard(client, friendID, callingCardFolders[0],
-                                  info.UserProfile.FirstName + " " + info.UserProfile.SurName);
-                // Compose (remote) response to friend.
-                GridInstantMessage msg = new GridInstantMessage(client.Scene, agentID, client.Name, friendID,
-                                                                (byte)InstantMessageDialog.FriendshipAccepted,
-                                                                agentID.ToString(), false, Vector3.Zero);
-                if (m_TransferModule != null)
-                {
-                    m_TransferModule.SendInstantMessage(msg,
-                        delegate(bool success) {
-                            m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
-                        }
-                    );
-                }
-            }
-            // tell client that new friend is online
-            client.SendAgentOnline(new UUID[] { friendID });
-        }
-        private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
-        {
-            m_log.DebugFormat("[FRIEND]: Got deny friendship from {0} {1}, agentID {2}, tid {3}",
-                              client.Name, client.AgentId, agentID, friendID);
-            // Compose response to other agent.
-            GridInstantMessage msg = new GridInstantMessage(client.Scene, agentID, client.Name, friendID,
-                                                            (byte)InstantMessageDialog.FriendshipDeclined,
-                                                            agentID.ToString(), false, Vector3.Zero);
-            // send decline to initiator
-            if (m_TransferModule != null)
-            {
-                m_TransferModule.SendInstantMessage(msg,
-                    delegate(bool success) {
-                        m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
-                    }
-                );
-            }
-        }
-        private void OnTerminateFriendship(IClientAPI client, UUID agentID, UUID exfriendID)
-        {
-            // client.AgentId == agentID!
-            // this removes the friends from the stored friendlists. After the next login, they will be gone...
-            m_initialScene.StoreRemoveFriendship(agentID, exfriendID);
-            // ... now tell the two involved clients that they aren't friends anymore.
-            // I don't know why we have to tell <agent>, as this was caused by her, but that's how it works in SL...
-            client.SendTerminateFriend(exfriendID);
-            // now send the friend, if online
-            ScenePresence presence = GetAnyPresenceFromAgentID(exfriendID);
-            if (presence != null)
-            {
-                m_log.DebugFormat("[FRIEND]: Sending terminate friend {0} to agent {1}", agentID, exfriendID);
-                presence.ControllingClient.SendTerminateFriend(agentID);
-            }
-            else
-            {
-                // retry 3 times, in case the agent TPed from the last known region...
-                for (int retry = 0; retry < 3; ++retry)
-                {
-                    // wasn't sent, so ex-friend wasn't around on this region-server. Fetch info and try to send
-                    UserAgentData data = m_initialScene.CommsManager.UserService.GetAgentByUUID(exfriendID);
-                    
-                    if (null == data)
-                        break;
-                    
-                    if (!data.AgentOnline)
-                    {
-                        m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID);
-                        break; // if ex-friend isn't online, we don't need to send
-                    }
-                    m_log.DebugFormat("[FRIEND]: Sending remote terminate friend {0} to agent {1}@{2}",
-                                      agentID, exfriendID, data.Handle);
-                    // try to send to foreign region, retry if it fails (friend TPed away, for example)
-                    if (TriggerTerminateFriend(data.Handle, exfriendID, agentID)) break;
-                }
-            }
-            // clean up cache: FriendList is wrong now...
-            lock (m_friendLists)
-            {
-                m_friendLists.Invalidate(agentID.ToString());
-                m_friendLists.Invalidate(exfriendID.ToString());
-            }
-        }
-        #endregion
-        #region CallingCards
-        private void OnOfferCallingCard(IClientAPI client, UUID destID, UUID transactionID)
        {
-            m_log.DebugFormat("[CALLING CARD]: got offer from {0} for {1}, transaction {2}",
-                              client.AgentId, destID, transactionID);
-            // This might be slightly wrong. On a multi-region server, we might get the child-agent instead of the root-agent
-            // (or the root instead of the child)
-            ScenePresence destAgent = GetAnyPresenceFromAgentID(destID);
-            if (destAgent == null)
-            {
-                client.SendAlertMessage("The person you have offered a card to can't be found anymore.");
-                return;
-            }
-            lock (m_pendingCallingcardRequests)
-            {
-                m_pendingCallingcardRequests[transactionID] = client.AgentId;
-            }
-            // inform the destination agent about the offer
-            destAgent.ControllingClient.SendOfferCallingCard(client.AgentId, transactionID);
        }
-        private void CreateCallingCard(IClientAPI client, UUID creator, UUID folder, string name)
+        public void RegionLoaded(Scene scene)
        {
-            InventoryItemBase item = new InventoryItemBase();
-            item.AssetID = UUID.Zero;
-            item.AssetType = (int)AssetType.CallingCard;
-            item.BasePermissions = (uint)PermissionMask.Copy;
-            item.CreationDate = Util.UnixTimeSinceEpoch();
-            item.CreatorId = creator.ToString();
-            item.CurrentPermissions = item.BasePermissions;
-            item.Description = "";
-            item.EveryOnePermissions = (uint)PermissionMask.None;
-            item.Flags = 0;
-            item.Folder = folder;
-            item.GroupID = UUID.Zero;
-            item.GroupOwned = false;
-            item.ID = UUID.Random();
-            item.InvType = (int)InventoryType.CallingCard;
-            item.Name = name;
-            item.NextPermissions = item.EveryOnePermissions;
-            item.Owner = client.AgentId;
-            item.SalePrice = 10;
-            item.SaleType = (byte)SaleType.Not;
-            ((Scene)client.Scene).AddInventoryItem(client, item);
        }
-        private void OnAcceptCallingCard(IClientAPI client, UUID transactionID, UUID folderID)
+        public void RemoveRegion(Scene scene)
        {
-            m_log.DebugFormat("[CALLING CARD]: User {0} ({1} {2}) accepted tid {3}, folder {4}",
-                              client.AgentId,
-                              client.FirstName, client.LastName,
-                              transactionID, folderID);
-            UUID destID;
-            lock (m_pendingCallingcardRequests)
-            {
-                if (!m_pendingCallingcardRequests.TryGetValue(transactionID, out destID))
-                {
-                    m_log.WarnFormat("[CALLING CARD]: Got a AcceptCallingCard from {0} without an offer before.",
-                                     client.Name);
-                    return;
-                }
-                // else found pending calling card request with that transaction.
-                m_pendingCallingcardRequests.Remove(transactionID);
-            }
-            ScenePresence destAgent = GetAnyPresenceFromAgentID(destID);
-            // inform sender of the card that destination declined the offer
-            if (destAgent != null) destAgent.ControllingClient.SendAcceptCallingCard(transactionID);
-            // put a calling card into the inventory of receiver
-            CreateCallingCard(client, destID, folderID, destAgent.Name);
        }
-        private void OnDeclineCallingCard(IClientAPI client, UUID transactionID)
+        public void Close()
        {
-            m_log.DebugFormat("[CALLING CARD]: User {0} (ID:{1}) declined card, tid {2}",
-                              client.Name, client.AgentId, transactionID);
-            UUID destID;
-            lock (m_pendingCallingcardRequests)
-            {
-                if (!m_pendingCallingcardRequests.TryGetValue(transactionID, out destID))
-                {
-                    m_log.WarnFormat("[CALLING CARD]: Got a AcceptCallingCard from {0} without an offer before.",
-                                     client.Name);
-                    return;
-                }
-                // else found pending calling card request with that transaction.
-                m_pendingCallingcardRequests.Remove(transactionID);
-            }
-            ScenePresence destAgent = GetAnyPresenceFromAgentID(destID);
-            // inform sender of the card that destination declined the offer
-            if (destAgent != null) destAgent.ControllingClient.SendDeclineCallingCard(transactionID);
        }
-        /// <summary>
+        public string Name
-        /// Send presence information about a client to other clients in both this region and others.
-        /// </summary>
-        /// <param name="client"></param>
-        /// <param name="friendList"></param>
-        /// <param name="iAmOnline"></param>
-        private void SendPresenceState(IClientAPI client, List<FriendListItem> friendList, bool iAmOnline)
        {
-            //m_log.DebugFormat("[FRIEND]: {0} logged {1}; sending presence updates", client.Name, iAmOnline ? "in" : "out");
+            get { return "FriendsModule"; }
-            if (friendList == null || friendList.Count == 0)
-            {
-                //m_log.DebugFormat("[FRIEND]: {0} doesn't have friends.", client.Name);
-                return; // nothing we can do if she doesn't have friends...
-            }
-            // collect sets of friendIDs; to send to (online and offline), and to receive from
-            // TODO: If we ever switch to .NET >= 3, replace those Lists with HashSets.
-            // I can't believe that we have Dictionaries, but no Sets, considering Java introduced them years ago...
-            List<UUID> friendIDsToSendTo = new List<UUID>();
-            List<UUID> candidateFriendIDsToReceive = new List<UUID>();
-            
-            foreach (FriendListItem item in friendList)
-            {
-                if (((item.FriendListOwnerPerms | item.FriendPerms) & (uint)FriendRights.CanSeeOnline) != 0)
-                {
-                    // friend is allowed to see my presence => add
-                    if ((item.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0) 
-                        friendIDsToSendTo.Add(item.Friend);
-                    if ((item.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0) 
-                        candidateFriendIDsToReceive.Add(item.Friend);
-                }
-            }
-            // we now have a list of "interesting" friends (which we have to find out on-/offline state for),
-            // friends we want to send our online state to (if *they* are online, too), and
-            // friends we want to receive online state for (currently unknown whether online or not)
-            // as this processing might take some time and friends might TP away, we try up to three times to
-            // reach them. Most of the time, we *will* reach them, and this loop won't loop
-            int retry = 0;
-            do
-            {
-                // build a list of friends to look up region-information and on-/offline-state for
-                List<UUID> friendIDsToLookup = new List<UUID>(friendIDsToSendTo);
-                foreach (UUID uuid in candidateFriendIDsToReceive)
-                {
-                    if (!friendIDsToLookup.Contains(uuid)) friendIDsToLookup.Add(uuid);
-                }
-                m_log.DebugFormat(
-                    "[FRIEND]: {0} to lookup, {1} to send to, {2} candidates to receive from for agent {3}",
-                    friendIDsToLookup.Count, friendIDsToSendTo.Count, candidateFriendIDsToReceive.Count, client.Name);
-                // we have to fetch FriendRegionInfos, as the (cached) FriendListItems don't
-                // necessarily contain the correct online state...
-                Dictionary<UUID, FriendRegionInfo> friendRegions = m_initialScene.GetFriendRegionInfos(friendIDsToLookup);
-                m_log.DebugFormat(
-                    "[FRIEND]: Found {0} regionInfos for {1} friends of {2}",
-                    friendRegions.Count, friendIDsToLookup.Count, client.Name);
-                // argument for SendAgentOn/Offline; we shouldn't generate that repeatedly within loops.
-                UUID[] agentArr = new UUID[] { client.AgentId };
-                // first, send to friend presence state to me, if I'm online...
-                if (iAmOnline)
-                {
-                    List<UUID> friendIDsToReceive = new List<UUID>();
-                    
-                    for (int i = candidateFriendIDsToReceive.Count - 1; i >= 0; --i)
-                    {
-                        UUID uuid = candidateFriendIDsToReceive[i];
-                        FriendRegionInfo info;
-                        if (friendRegions.TryGetValue(uuid, out info) && info != null && info.isOnline)
-                        {
-                            friendIDsToReceive.Add(uuid);
-                        }
-                    }
-                    
-                    m_log.DebugFormat(
-                        "[FRIEND]: Sending {0} online friends to {1}", friendIDsToReceive.Count, client.Name);
-                    
-                    if (friendIDsToReceive.Count > 0) 
-                        client.SendAgentOnline(friendIDsToReceive.ToArray());
-                    // clear them for a possible second iteration; we don't have to repeat this
-                    candidateFriendIDsToReceive.Clear();
-                }
-                // now, send my presence state to my friends
-                for (int i = friendIDsToSendTo.Count - 1; i >= 0; --i)
-                {
-                    UUID uuid = friendIDsToSendTo[i];
-                    FriendRegionInfo info;
-                    if (friendRegions.TryGetValue(uuid, out info) && info != null && info.isOnline)
-                    {
-                        // any client is good enough, root or child...
-                        ScenePresence agent = GetAnyPresenceFromAgentID(uuid);
-                        if (agent != null)
-                        {
-                            //m_log.DebugFormat("[FRIEND]: Found local agent {0}", agent.Name);
-                            // friend is online and on this server...
-                            if (iAmOnline) agent.ControllingClient.SendAgentOnline(agentArr);
-                            else agent.ControllingClient.SendAgentOffline(agentArr);
-                            // done, remove it
-                            friendIDsToSendTo.RemoveAt(i);
-                        }
-                    }
-                    else
-                    {
-                        //m_log.DebugFormat("[FRIEND]: Friend {0} ({1}) is offline; not sending.", uuid, i);
-                        // friend is offline => no need to try sending
-                        friendIDsToSendTo.RemoveAt(i);
-                    }
-                }
-                m_log.DebugFormat("[FRIEND]: Have {0} friends to contact via inter-region comms.", friendIDsToSendTo.Count);
-                // we now have all the friends left that are online (we think), but not on this region-server
-                if (friendIDsToSendTo.Count > 0)
-                {
-                    // sort them into regions
-                    Dictionary<ulong, List<UUID>> friendsInRegion = new Dictionary<ulong,List<UUID>>();
-                    foreach (UUID uuid in friendIDsToSendTo)
-                    {
-                        ulong handle = friendRegions[uuid].regionHandle; // this can't fail as we filtered above already
-                        List<UUID> friends;
-                        if (!friendsInRegion.TryGetValue(handle, out friends))
-                        {
-                            friends = new List<UUID>();
-                            friendsInRegion[handle] = friends;
-                        }
-                        friends.Add(uuid);
-                    }
-                    m_log.DebugFormat("[FRIEND]: Found {0} regions to send to.", friendRegions.Count);
-                    // clear uuids list and collect missed friends in it for the next retry
-                    friendIDsToSendTo.Clear();
-                    // send bulk updates to the region
-                    foreach (KeyValuePair<ulong, List<UUID>> pair in friendsInRegion)
-                    {
-                        //m_log.DebugFormat("[FRIEND]: Inform {0} friends in region {1} that user {2} is {3}line",
-                        //                  pair.Value.Count, pair.Key, client.Name, iAmOnline ? "on" : "off");
-                        friendIDsToSendTo.AddRange(InformFriendsInOtherRegion(client.AgentId, pair.Key, pair.Value, iAmOnline));
-                    }
-                }
-                // now we have in friendIDsToSendTo only the agents left that TPed away while we tried to contact them.
-                // In most cases, it will be empty, and it won't loop here. But sometimes, we have to work harder and try again...
-            }
-            while (++retry < 3 && friendIDsToSendTo.Count > 0);
        }
-        private void OnEconomyDataRequest(UUID agentID)
+        public Type ReplaceableInterface
        {
-            // KLUDGE: This is the only way I found to get a message (only) after login was completed and the
+            get { return null; }
-            // client is connected enough to receive UDP packets).
-            // This packet seems to be sent only once, just after connection was established to the first
-            // region after login.
-            // We use it here to trigger a presence update; the old update-on-login was never be heard by
-            // the freshly logged in viewer, as it wasn't connected to the region at that time.
-            // TODO: Feel free to replace this by a better solution if you find one.
-            // get the agent. This should work every time, as we just got a packet from it
-            //ScenePresence agent = GetRootPresenceFromAgentID(agentID);
-            // KLUDGE 2: As this is sent quite early, the avatar isn't here as root agent yet. So, we have to cheat a bit
-            ScenePresence agent = GetAnyPresenceFromAgentID(agentID);
-            // just to be paranoid...
-            if (agent == null)
-            {
-                m_log.ErrorFormat("[FRIEND]: Got a packet from agent {0} who can't be found anymore!?", agentID);
-                return;
-            }
-            List<FriendListItem> fl;
-            lock (m_friendLists)
-            {
-                fl = (List<FriendListItem>)m_friendLists.Get(agent.ControllingClient.AgentId.ToString(),
-                                                             m_initialScene.GetFriendList);
-            }
-            // tell everyone that we are online
-            SendPresenceState(agent.ControllingClient, fl, true);
        }
-        private void OnLogout(IClientAPI remoteClient)
+        public void OfferFriendship(UUID fromUserId, IClientAPI toUserClient,
+                string offerMessage)
        {
-            List<FriendListItem> fl;
-            lock (m_friendLists)
-            {
-                fl = (List<FriendListItem>)m_friendLists.Get(remoteClient.AgentId.ToString(),
-                                                             m_initialScene.GetFriendList);
-            }
-            // tell everyone that we are offline
-            SendPresenceState(remoteClient, fl, false);
-        }
-        private void GrantUserFriendRights(IClientAPI remoteClient, UUID requester, UUID target, int rights)
-        {
-            ((Scene)remoteClient.Scene).CommsManager.UpdateUserFriendPerms(requester, target, (uint)rights);
        }
        public void FindAgent(IClientAPI remoteClient, UUID hunter, UUID target)
        {
@@ -1140,15 +635,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        public List<FriendListItem> GetUserFriends(UUID agentID)
        {
-            List<FriendListItem> fl;
+            return null;
-            lock (m_friendLists)
-            {
-                fl = (List<FriendListItem>)m_friendLists.Get(agentID.ToString(),
-                        m_initialScene.GetFriendList);
-            }
-            return fl;
        }
    }
-    #endregion
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 9a68749..ab141eb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,6 +24,7 @@
 * (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;
@@ -36,9 +37,10 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class InstantMessageModule : IRegionModule
+    public class InstantMessageModule : ISharedRegionModule
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
        /// <value>
        /// Is this module enabled?
@@ -51,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        private IMessageTransferModule m_TransferModule = null;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (config.Configs["Messaging"] != null)
            {
@@ -62,6 +64,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            }
            
            m_enabled = true;
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
            lock (m_scenes)
            {
@@ -74,6 +82,39 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            }
        }
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+            if (m_TransferModule == null)
+            {
+                m_TransferModule =
+                    scene.RequestModuleInterface<IMessageTransferModule>();
+                if (m_TransferModule == null)
+                {
+                    m_log.Error("[INSTANT MESSAGE]: No message transfer module, IM will not work!");
+                    scene.EventManager.OnClientConnect -= OnClientConnect;
+                    scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+                    m_scenes.Clear();
+                    m_enabled = false;
+                }
+            }
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+            lock (m_scenes)
+            {
+                m_scenes.Remove(scene);
+            }
+        }
        void OnClientConnect(IClientCore client)
        {
            IClientIM clientIM;
@@ -85,15 +126,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        public void PostInitialise()
        {
-            if (!m_enabled)
-                return;
-            
-            m_TransferModule =
-                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
-            if (m_TransferModule == null)
-                m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
-                "IM will not work!");
        }
        public void Close()
@@ -105,9 +137,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            get { return "InstantMessageModule"; }
        }
-        public bool IsSharedModule
+        public Type ReplaceableInterface
        {
-            get { return true; }
+            get { return null; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index e5159b3..2d4b421 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -40,18 +40,17 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class MessageTransferModule : IRegionModule, IMessageTransferModule
+    public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        // private bool m_Enabled = false;
+        private bool m_Enabled = false;
-        protected bool m_Gridmode = false;
        protected List<Scene> m_Scenes = new List<Scene>();
        protected Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>();
        public event UndeliveredMessage OnUndeliveredMessage;
-        public virtual void Initialise(Scene scene, IConfigSource config)
+        public virtual void Initialise(IConfigSource config)
        {
            IConfig cnf = config.Configs["Messaging"];
            if (cnf != null && cnf.GetString(
@@ -62,20 +61,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                return;
            }
-            cnf = config.Configs["Startup"];
+            m_Enabled = true;
-            if (cnf != null)
+        }
-                m_Gridmode = cnf.GetBoolean("gridmode", false);
-            // m_Enabled = true;
+        public virtual void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
            lock (m_Scenes)
            {
-                if (m_Scenes.Count == 0)
-                {
-                    MainServer.Instance.AddXmlRPCHandler(
-                        "grid_instant_message", processXMLRPCGridInstantMessage);
-                }
                m_log.Debug("[MESSAGE TRANSFER]: Message transfer module active");
                scene.RegisterModuleInterface<IMessageTransferModule>(this);
                m_Scenes.Add(scene);
@@ -84,6 +79,26 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        public virtual void PostInitialise()
        {
+            if (!m_Enabled)
+                return;
+            MainServer.Instance.AddXmlRPCHandler(
+                "grid_instant_message", processXMLRPCGridInstantMessage);
+        }
+        public virtual void RegionLoaded(Scene scene)
+        {
+        }
+        public virtual void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+            lock(m_Scenes)
+            {
+                m_Scenes.Remove(scene);
+            }
        }
        public virtual void Close()
@@ -95,9 +110,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            get { return "MessageTransferModule"; }
        }
-        public virtual bool IsSharedModule
+        public virtual Type ReplaceableInterface
        {
-            get { return true; }
+            get { return null; }
        }
        public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
@@ -148,15 +163,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                }
            }
-            if (m_Gridmode)
+            SendGridInstantMessageViaXMLRPC(im, result);
-            {
-                //m_log.DebugFormat("[INSTANT MESSAGE]: Delivering via grid");
-                // Still here, try send via Grid
-                SendGridInstantMessageViaXMLRPC(im, result);
-                return;
-            }
-            HandleUndeliveredMessage(im, result);
            return;
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 2d4a635..24cbaeb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -37,9 +37,9 @@ using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-namespace OpenSim.Region.CoreModules.Avatar.MuteList
+namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class MuteListModule : IRegionModule
+    public class MuteListModule : ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -47,11 +47,8 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
        private List<Scene> m_SceneList = new List<Scene>();
        private string m_RestURL = String.Empty;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
-            if (!enabled)
-                return;
            IConfig cnf = config.Configs["Messaging"];
            if (cnf == null)
            {
@@ -59,39 +56,53 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
                return;
            }
-            if (cnf != null && cnf.GetString(
+            if (cnf != null && cnf.GetString("MuteListModule", "None") !=
-                    "MuteListModule", "None") !=
                    "MuteListModule")
            {
                enabled = false;
                return;
            }
+            m_RestURL = cnf.GetString("MuteListURL", "");
+            if (m_RestURL == "")
+            {
+                m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
+                enabled = false;
+                return;
+            }
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!enabled)
+                return;
            lock (m_SceneList)
            {
-                if (m_SceneList.Count == 0)
+                m_SceneList.Add(scene);
-                {
-                    m_RestURL = cnf.GetString("MuteListURL", "");
-                    if (m_RestURL == "")
-                    {
-                        m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
-                        enabled = false;
-                        return;
-                    }
-                }
-                if (!m_SceneList.Contains(scene))
-                    m_SceneList.Add(scene);
                scene.EventManager.OnNewClient += OnNewClient;
            }
        }
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
        {
            if (!enabled)
                return;
-            if (m_SceneList.Count == 0)
+            lock (m_SceneList)
+            {
+                m_SceneList.Remove(scene);
+            }
+        }
+        public void PostInitialise()
+        {
+            if (!enabled)
                return;
            m_log.Debug("[MUTE LIST] Mute list enabled");
@@ -102,26 +113,15 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
            get { return "MuteListModule"; }
        }
-        public bool IsSharedModule
+        public Type ReplaceableInterface
        {
-            get { return true; }
+            get { return null; }
        }
        
        public void Close()
        {
        }
       
-//        private IClientAPI FindClient(UUID agentID)
-//        {
-//            foreach (Scene s in m_SceneList)
-//            {
-//                ScenePresence presence = s.GetScenePresence(agentID);
-//                if (presence != null && !presence.IsChildAgent)
-//                    return presence.ControllingClient;
-//            }
-//            return null;
-//        }
        private void OnNewClient(IClientAPI client)
        {
            client.OnMuteListRequest += OnMuteListRequest;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 1614b70..a835c52 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -40,78 +40,88 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class OfflineMessageModule : IRegionModule
+    public class OfflineMessageModule : ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private bool enabled = true;
        private List<Scene> m_SceneList = new List<Scene>();
        private string m_RestURL = String.Empty;
+        IMessageTransferModule m_TransferModule = null;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
-            if (!enabled)
-                return;
            IConfig cnf = config.Configs["Messaging"];
            if (cnf == null)
            {
                enabled = false;
                return;
            }
-            if (cnf != null && cnf.GetString(
+            if (cnf != null && cnf.GetString("OfflineMessageModule", "None") !=
-                    "OfflineMessageModule", "None") !=
                    "OfflineMessageModule")
            {
                enabled = false;
                return;
            }
+            m_RestURL = cnf.GetString("OfflineMessageURL", "");
+            if (m_RestURL == "")
+            {
+                m_log.Error("[OFFLINE MESSAGING] Module was enabled, but no URL is given, disabling");
+                enabled = false;
+                return;
+            }
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!enabled)
+                return;
            lock (m_SceneList)
            {
-                if (m_SceneList.Count == 0)
+                m_SceneList.Add(scene);
-                {
-                    m_RestURL = cnf.GetString("OfflineMessageURL", "");
-                    if (m_RestURL == "")
-                    {
-                        m_log.Error("[OFFLINE MESSAGING] Module was enabled, but no URL is given, disabling");
-                        enabled = false;
-                        return;
-                    }
-                }
-                if (!m_SceneList.Contains(scene))
-                    m_SceneList.Add(scene);
                scene.EventManager.OnNewClient += OnNewClient;
            }
        }
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
        {
            if (!enabled)
                return;
-            if (m_SceneList.Count == 0)
+            if (m_TransferModule == null)
-                return;
-            IMessageTransferModule trans = m_SceneList[0].RequestModuleInterface<IMessageTransferModule>();
-            if (trans == null)
            {
-                enabled = false;
+                m_TransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
+                if (m_TransferModule == null)
-                lock (m_SceneList)
                {
-                    foreach (Scene s in m_SceneList)
+                    scene.EventManager.OnNewClient -= OnNewClient;
-                        s.EventManager.OnNewClient -= OnNewClient;
+                    enabled = false;
                    m_SceneList.Clear();
+                    m_log.Error("[OFFLINE MESSAGING] No message transfer module is enabled. Diabling offline messages");
                }
+                m_TransferModule.OnUndeliveredMessage += UndeliveredMessage;
+            }
+        }
-                m_log.Error("[OFFLINE MESSAGING] No message transfer module is enabled. Diabling offline messages");
+        public void RemoveRegion(Scene scene)
+        {
+            if (!enabled)
                return;
+            lock (m_SceneList)
+            {
+                m_SceneList.Remove(scene);
            }
+        }
-            trans.OnUndeliveredMessage += UndeliveredMessage;
+        public void PostInitialise()
+        {
+            if (!enabled)
+                return;
            m_log.Debug("[OFFLINE MESSAGING] Offline messages enabled");
        }
@@ -121,9 +131,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            get { return "OfflineMessageModule"; }
        }
-        public bool IsSharedModule
+        public Type ReplaceableInterface
        {
-            get { return true; }
+            get { return null; }
        }
        
        public void Close()
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index f5ab454..267a90a 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,6 +24,7 @@
 * (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;
@@ -39,404 +40,54 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class PresenceModule : IRegionModule, IPresenceModule
+    public class PresenceModule : ISharedRegionModule, IPresenceModule
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
-        private bool m_Enabled = false;
-        private bool m_Gridmode = false;
-        // some default scene for doing things that aren't connected to a specific scene. Avoids locking.
-        private Scene m_initialScene;
-        private List<Scene> m_Scenes = new List<Scene>();
-        // we currently are only interested in root-agents. If the root isn't here, we don't know the region the
-        // user is in, so we have to ask the messaging server anyway.
-        private Dictionary<UUID, Scene> m_RootAgents =
-                new Dictionary<UUID, Scene>();
        public event PresenceChange OnPresenceChange;
        public event BulkPresenceData OnBulkPresenceData;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
-            lock (m_Scenes)
-            {
-                // This is a shared module; Initialise will be called for every region on this server.
-                // Only check config once for the first region.
-                if (m_Scenes.Count == 0)
-                {
-                    IConfig cnf = config.Configs["Messaging"];
-                    if (cnf != null && cnf.GetString(
-                            "PresenceModule", "PresenceModule") !=
-                            "PresenceModule")
-                        return;
-                    cnf = config.Configs["Startup"];
-                    if (cnf != null)
-                        m_Gridmode = cnf.GetBoolean("gridmode", false);
-                    m_Enabled = true;
-                    m_initialScene = scene;
-                }
-                if (m_Gridmode)
-                    NotifyMessageServerOfStartup(scene);
-                m_Scenes.Add(scene);
-            }
-            scene.RegisterModuleInterface<IPresenceModule>(this);
-            scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
-            scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
        }
-        public void PostInitialise()
+        public void AddRegion(Scene scene)
        {
        }
-        public void Close()
+        public void RegionLoaded(Scene scene)
        {
-            if (!m_Gridmode || !m_Enabled)
-                return;
-            if (OnPresenceChange != null)
-            {
-                lock (m_RootAgents)
-                {
-                    // on shutdown, users are kicked, too
-                    foreach (KeyValuePair<UUID, Scene> pair in m_RootAgents)
-                    {
-                        OnPresenceChange(new PresenceInfo(pair.Key, UUID.Zero));
-                    }
-                }
-            }
-            lock (m_Scenes)
-            {
-                foreach (Scene scene in m_Scenes)
-                    NotifyMessageServerOfShutdown(scene);
-            }
        }
-        public string Name
+        public void RemoveRegion(Scene scene)
        {
-            get { return "PresenceModule"; }
-        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-        public void RequestBulkPresenceData(UUID[] users)
-        {
-            if (OnBulkPresenceData != null)
-            {
-                PresenceInfo[] result = new PresenceInfo[users.Length];
-                if (m_Gridmode)
-                {
-                    // first check the local information
-                    List<UUID> uuids = new List<UUID>(); // the uuids to check remotely
-                    List<int> indices = new List<int>(); // just for performance.
-                    lock (m_RootAgents)
-                    {
-                        for (int i = 0; i < uuids.Count; ++i)
-                        {
-                            Scene scene;
-                            if (m_RootAgents.TryGetValue(users[i], out scene)) 
-                            {
-                                result[i] = new PresenceInfo(users[i], scene.RegionInfo.RegionID);
-                            }
-                            else
-                            {
-                                uuids.Add(users[i]);
-                                indices.Add(i);
-                            }
-                        }
-                    }
-                    // now we have filtered out all the local root agents. The rest we have to request info about
-                    Dictionary<UUID, FriendRegionInfo> infos = m_initialScene.GetFriendRegionInfos(uuids);
-                    for (int i = 0; i < uuids.Count; ++i)
-                    {
-                        FriendRegionInfo info;
-                        if (infos.TryGetValue(uuids[i], out info) && info.isOnline)
-                        {
-                            UUID regionID = info.regionID;
-                            if (regionID == UUID.Zero)
-                            {
-                                // TODO this is the old messaging-server protocol; only the regionHandle is available.
-                                // Fetch region-info to get the id
-                                uint x = 0, y = 0;
-                                Utils.LongToUInts(info.regionHandle, out x, out y);
-                                GridRegion regionInfo = m_initialScene.GridService.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID,
-                                    (int)x, (int)y);
-                                regionID = regionInfo.RegionID;
-                            }
-                            result[indices[i]] = new PresenceInfo(uuids[i], regionID);
-                        }
-                        else result[indices[i]] = new PresenceInfo(uuids[i], UUID.Zero);
-                    }
-                }
-                else
-                {
-                    // in standalone mode, we have all the info locally available.
-                    lock (m_RootAgents)
-                    {
-                        for (int i = 0; i < users.Length; ++i)
-                        {
-                            Scene scene;
-                            if (m_RootAgents.TryGetValue(users[i], out scene))
-                            {
-                                result[i] = new PresenceInfo(users[i], scene.RegionInfo.RegionID);
-                            }
-                            else
-                            {
-                                result[i] = new PresenceInfo(users[i], UUID.Zero);
-                            }
-                        }
-                    }
-                }
-                // tell everyone
-                OnBulkPresenceData(result);
-            }
-        }
-        // new client doesn't mean necessarily that user logged in, it just means it entered one of the
-        // the regions on this server
-        public void OnNewClient(IClientAPI client)
-        {
-            client.OnConnectionClosed += OnConnectionClosed;
-            client.OnLogout += OnLogout;
-            // KLUDGE: See handler for details.
-            client.OnEconomyDataRequest += OnEconomyDataRequest;
        }
-        // connection closed just means *one* client connection has been closed. It doesn't mean that the
+        public void PostInitialise()
-        // user has logged off; it might have just TPed away.
-        public void OnConnectionClosed(IClientAPI client)
-        {
-            // TODO: Have to think what we have to do here...
-            // Should we just remove the root from the list (if scene matches)?
-            if (!(client.Scene is Scene))
-                return;
-            Scene scene = (Scene)client.Scene;
-            lock (m_RootAgents)
-            {
-                Scene rootScene;
-                if (!(m_RootAgents.TryGetValue(client.AgentId, out rootScene)) || scene != rootScene)
-                    return;
-                m_RootAgents.Remove(client.AgentId);
-            }
-            // Should it have logged off, we'll do the logout part in OnLogout, even if no root is stored
-            // anymore. It logged off, after all...
-        }
-        // Triggered when the user logs off.
-        public void OnLogout(IClientAPI client)
-        {
-            if (!(client.Scene is Scene))
-                return;
-            Scene scene = (Scene)client.Scene;
-            // On logout, we really remove the client from rootAgents, even if the scene doesn't match
-            lock (m_RootAgents)
-            {
-                if (m_RootAgents.ContainsKey(client.AgentId)) m_RootAgents.Remove(client.AgentId);
-            }
-            // now inform the messaging server and anyone who is interested
-            NotifyMessageServerOfAgentLeaving(client.AgentId, scene.RegionInfo.RegionID, scene.RegionInfo.RegionHandle);
-            if (OnPresenceChange != null) OnPresenceChange(new PresenceInfo(client.AgentId, UUID.Zero));
-        }
-        public void OnSetRootAgentScene(UUID agentID, Scene scene)
-        {
-            // OnSetRootAgentScene can be called from several threads at once (with different agentID).
-            // Concurrent access to m_RootAgents is prone to failure on multi-core/-processor systems without
-            // correct locking).
-            lock (m_RootAgents)
-            {
-                Scene rootScene;
-                if (m_RootAgents.TryGetValue(agentID, out rootScene) && scene == rootScene)
-                {
-                    return;
-                }
-                m_RootAgents[agentID] = scene;
-            }
-            // inform messaging server that agent changed the region
-            Util.FireAndForget(
-                delegate(object o)
-                {
-                    NotifyMessageServerOfAgentLocation(agentID, scene.RegionInfo.RegionID, scene.RegionInfo.RegionHandle);
-                }
-            );
-        }
-        private void OnEconomyDataRequest(UUID agentID)
        {
-            // KLUDGE: This is the only way I found to get a message (only) after login was completed and the
-            // client is connected enough to receive UDP packets.
-            // This packet seems to be sent only once, just after connection was established to the first
-            // region after login.
-            // We use it here to trigger a presence update; the old update-on-login was never be heard by
-            // the freshly logged in viewer, as it wasn't connected to the region at that time.
-            // TODO: Feel free to replace this by a better solution if you find one.
-            // get the agent. This should work every time, as we just got a packet from it
-            ScenePresence agent = null;
-            lock (m_Scenes)
-            {
-                foreach (Scene scene in m_Scenes)
-                {
-                    agent = scene.GetScenePresence(agentID);
-                    if (agent != null) break;
-                }
-            }
-            // just to be paranoid...
-            if (agent == null)
-            {
-                m_log.ErrorFormat("[PRESENCE]: Got a packet from agent {0} who can't be found anymore!?", agentID);
-                return;
-            }
-            // we are a bit premature here, but the next packet will switch this child agent to root.
-            if (OnPresenceChange != null) OnPresenceChange(new PresenceInfo(agentID, agent.Scene.RegionInfo.RegionID));
        }
-        public void OnMakeChildAgent(ScenePresence agent)
+        public void Close()
        {
-            // OnMakeChildAgent can be called from several threads at once (with different agent).
-            // Concurrent access to m_RootAgents is prone to failure on multi-core/-processor systems without
-            // correct locking).
-            lock (m_RootAgents)
-            {
-                Scene rootScene;
-                if (m_RootAgents.TryGetValue(agent.UUID, out rootScene) && agent.Scene == rootScene)
-                {
-                    m_RootAgents.Remove(agent.UUID);
-                }
-            }
-            // don't notify the messaging-server; either this agent just had been downgraded and another one will be upgraded
-            // to root momentarily (which will notify the messaging-server), or possibly it will be closed in a moment,
-            // which will update the messaging-server, too.
        }
-        private void NotifyMessageServerOfStartup(Scene scene)
+        public string Name
        {
-            Hashtable xmlrpcdata = new Hashtable();
+            get { return "PresenceModule"; }
-            xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(xmlrpcdata);
-            try
-            {
-                XmlRpcRequest UpRequest = new XmlRpcRequest("region_startup", SendParams);
-                XmlRpcResponse resp = UpRequest.Send(scene.CommsManager.NetworkServersInfo.MessagingURL, 5000);
-                Hashtable responseData = (Hashtable)resp.Value;
-                if (responseData == null || (!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
-                {
-                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
-                }
-            }
-            catch (WebException)
-            {
-                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
-            }
        }
-        private void NotifyMessageServerOfShutdown(Scene scene)
+        public Type ReplaceableInterface
        {
-            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+            get { return null; }
-                return;
-            
-            Hashtable xmlrpcdata = new Hashtable();
-            xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(xmlrpcdata);
-            try
-            {
-                XmlRpcRequest DownRequest = new XmlRpcRequest("region_shutdown", SendParams);
-                XmlRpcResponse resp = DownRequest.Send(scene.CommsManager.NetworkServersInfo.MessagingURL, 5000);
-                Hashtable responseData = (Hashtable)resp.Value;
-                if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
-                {
-                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
-                }
-            }
-            catch (WebException)
-            {
-                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
-            }
        }
-        private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle)
+        public void RequestBulkPresenceData(UUID[] users)
        {
-            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
-                return;
-            Hashtable xmlrpcdata = new Hashtable();
-            xmlrpcdata["AgentID"] = agentID.ToString();
-            xmlrpcdata["RegionUUID"] = region.ToString();
-            xmlrpcdata["RegionHandle"] = regionHandle.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(xmlrpcdata);
-            try
-            {
-                XmlRpcRequest LocationRequest = new XmlRpcRequest("agent_location", SendParams);
-                XmlRpcResponse resp = LocationRequest.Send(m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL, 5000);
-                Hashtable responseData = (Hashtable)resp.Value;
-                if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
-                {
-                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
-                }
-            }
-            catch (WebException)
-            {
-                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
-            }
        }
-        private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle)
+        public void OnNewClient(IClientAPI client)
        {
-            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
-                return;
-            Hashtable xmlrpcdata = new Hashtable();
-            xmlrpcdata["AgentID"] = agentID.ToString();
-            xmlrpcdata["RegionUUID"] = region.ToString();
-            xmlrpcdata["RegionHandle"] = regionHandle.ToString();
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(xmlrpcdata);
-            try
-            {
-                XmlRpcRequest LeavingRequest = new XmlRpcRequest("agent_leaving", SendParams);
-                XmlRpcResponse resp = LeavingRequest.Send(m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL, 5000);
-                Hashtable responseData = (Hashtable)resp.Value;
-                if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
-                {
-                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
-                }
-            }
-            catch (WebException)
-            {
-                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
-            }
        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d9a021f..55d4f14 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
-    public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
+    public class InventoryTransferModule : IInventoryTransferModule, ISharedRegionModule
    {
        private static readonly ILog m_log
            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,10 +50,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                new Dictionary<UUID, Scene>();
        private IMessageTransferModule m_TransferModule = null;
+        private bool m_Enabled = true;
        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (config.Configs["Messaging"] != null)
            {
@@ -62,29 +63,56 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                if (config.Configs["Messaging"].GetString(
                        "InventoryTransferModule", "InventoryTransferModule") !=
                        "InventoryTransferModule")
+                {
+                    m_Enabled = false;
                    return;
+                }
            }
+        }
-            if (!m_Scenelist.Contains(scene))
+        public void AddRegion(Scene scene)
-            {
+        {
-                m_Scenelist.Add(scene);
+            if (!m_Enabled)
+                return;
-                scene.RegisterModuleInterface<IInventoryTransferModule>(this);
+            m_Scenelist.Add(scene);
-                scene.EventManager.OnNewClient += OnNewClient;
+            scene.RegisterModuleInterface<IInventoryTransferModule>(this);
-                scene.EventManager.OnClientClosed += ClientLoggedOut;
-                scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+            scene.EventManager.OnNewClient += OnNewClient;
-            }
+            scene.EventManager.OnClientClosed += ClientLoggedOut;
+            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
        }
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
        {
-            if (m_Scenelist.Count > 0)
+            if (m_TransferModule == null)
            {
                m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
                if (m_TransferModule == null)
+                {
                    m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only");
+                    m_Enabled = false;
+                    m_Scenelist.Clear();
+                    scene.EventManager.OnNewClient -= OnNewClient;
+                    scene.EventManager.OnClientClosed -= ClientLoggedOut;
+                    scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+                }
            }
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnClientClosed -= ClientLoggedOut;
+            scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+            m_Scenelist.Remove(scene);
+        }
+        public void PostInitialise()
+        {
        }
        public void Close()
@@ -96,9 +124,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
            get { return "InventoryModule"; }
        }
-        public bool IsSharedModule
+        public Type ReplaceableInterface
        {
-            get { return true; }
+            get { return null; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 261bd6c..d1d7df2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -37,34 +37,72 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
-    public class LureModule : IRegionModule
+    public class LureModule : ISharedRegionModule
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
        private readonly List<Scene> m_scenes = new List<Scene>();
        private IMessageTransferModule m_TransferModule = null;
+        private bool m_Enabled = true;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (config.Configs["Messaging"] != null)
            {
                if (config.Configs["Messaging"].GetString(
                        "LureModule", "LureModule") !=
                        "LureModule")
-                    return;
+                    m_Enabled = false;
            }
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
            lock (m_scenes)
            {
-                if (!m_scenes.Contains(scene))
+                m_scenes.Add(scene);
+                scene.EventManager.OnNewClient += OnNewClient;
+                scene.EventManager.OnIncomingInstantMessage +=
+                        OnGridInstantMessage;
+            }
+        }
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_TransferModule == null)
+            {
+                m_TransferModule =
+                    scene.RequestModuleInterface<IMessageTransferModule>();
+                if (m_TransferModule == null)
                {
-                    m_scenes.Add(scene);
+                    m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
-                    scene.EventManager.OnNewClient += OnNewClient;
+                    "lures will not work!");
-                    scene.EventManager.OnIncomingInstantMessage +=
+                    m_Enabled = false;
+                    m_scenes.Clear();
+                    scene.EventManager.OnNewClient -= OnNewClient;
+                    scene.EventManager.OnIncomingInstantMessage -=
                            OnGridInstantMessage;
                }
            }
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            lock (m_scenes)
+            {
+                m_scenes.Remove(scene);
+                scene.EventManager.OnNewClient -= OnNewClient;
+                scene.EventManager.OnIncomingInstantMessage -=
+                        OnGridInstantMessage;
+            }
        }
        void OnNewClient(IClientAPI client)
@@ -76,12 +114,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
        public void PostInitialise()
        {
-            m_TransferModule =
-                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
-            if (m_TransferModule == null)
-                m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
-                "lures will not work!");
        }
        public void Close()
@@ -93,9 +125,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
            get { return "LureModule"; }
        }
-        public bool IsSharedModule
+        public Type ReplaceableInterface
        {
-            get { return true; }
+            get { return null; }
        }
        public void OnInstantMessage(IClientAPI client, GridInstantMessage im)
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index beb2307..e4b0fd5 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -17,13 +17,19 @@
        <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" />
        <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" />
        <RegionModule id="Chat" type="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" />
+        <RegionModule id="FriendsModule" type="OpenSim.Region.CoreModules.Avatar.Friends.FriendsModule" />
+        <RegionModule id="PresenceModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.PresenceModule" />
+        <RegionModule id="MuteListModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.MuteListModule" />
+        <RegionModule id="OfflineMessageModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.OfflineMessageModule" />
+        <RegionModule id="InstantMessageModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.InstantMessageModule" />
+        <RegionModule id="MessageTransferModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.MessageTransferModule" />
+        <RegionModule id="LureModule" type="OpenSim.Region.CoreModules.Avatar.Lure.LureModule" />
+        <RegionModule id="InventoryTransferModule" type="OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.InventoryTransferModule" />
        <RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" />
        <RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />
        <RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>
        <RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>
      <!-- Service connectors OUT modules -->
-        <RegionModule id="LocalUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.User.LocalUserServicesConnector" />
-        <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.User.RemoteUserServicesConnector" />
        <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
        <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />
        <RegionModule id="LocalAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.LocalAuthorizationServicesConnector" />
@@ -41,6 +47,10 @@
        <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" />
        <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" />
        <RegionModule id="HGGridConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.HGGridConnector" />
+        <RegionModule id="LocalPresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.LocalPresenceServicesConnector" />
+        <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
+        <RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
+        <RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
      <!-- Service connectors IN modules -->
        <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
        <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index 44458d1..fa3681a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -436,12 +436,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
            }
            OSDMap resp = new OSDMap(2);
-            string reason = String.Empty;
+            string reason = String.Empty;
-            uint teleportFlags = 0;
+            uint teleportFlags = 0;
-            if (args.ContainsKey("teleport_flags"))
+            if (args.ContainsKey("teleport_flags"))
-            {
+            {
-                teleportFlags = args["teleport_flags"].AsUInteger();
+                teleportFlags = args["teleport_flags"].AsUInteger();
-            }
+            }
            
            // This is the meaning of POST agent
            m_regionClient.AdjustUserInformation(aCircuit);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
new file mode 100644
index 0000000..2cb18c7
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
@@ -0,0 +1,200 @@
+/*
+ * 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 OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
+{
+    public class LocalPresenceServicesConnector : ISharedRegionModule, IPresenceService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private bool m_Enabled = false;
+        private PresenceDetector m_PresenceDetector;
+        private IPresenceService m_PresenceService;
+        public LocalPresenceServicesConnector()
+        {
+        }
+        public LocalPresenceServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+        #region ISharedRegionModule
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public string Name
+        {
+            get { return "LocalPresenceServicesConnector"; }
+        }
+        public void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("PresenceServices", "");
+                if (name == Name)
+                {
+                    IConfig inventoryConfig = source.Configs["PresenceService"];
+                    if (inventoryConfig == null)
+                    {
+                        m_log.Error("[LOCAL PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
+                        return;
+                    }
+                    string serviceDll = inventoryConfig.GetString("LocalServiceModule", String.Empty);
+                    if (serviceDll == String.Empty)
+                    {
+                        m_log.Error("[LOCAL PRESENCE CONNECTOR]: No LocalServiceModule named in section PresenceService");
+                        return;
+                    }
+                    Object[] args = new Object[] { source };
+                    m_log.DebugFormat("[LOCAL PRESENCE CONNECTOR]: Service dll = {0}", serviceDll);
+                    m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(serviceDll, args);
+                    if (m_PresenceService == null)
+                    {
+                        m_log.Error("[LOCAL PRESENCE CONNECTOR]: Can't load presence service");
+                        //return;
+                        throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
+                    }
+                    //Init(source);
+                    m_PresenceDetector = new PresenceDetector(this);
+                    m_Enabled = true;
+                    m_log.Info("[LOCAL PRESENCE CONNECTOR]: Local presence connector enabled");
+                }
+            }
+        }
+        public void PostInitialise()
+        {
+        }
+        public void Close()
+        {
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+            //            m_log.DebugFormat(
+            //                "[LOCAL PRESENCE CONNECTOR]: Registering IPresenceService to scene {0}", scene.RegionInfo.RegionName);
+            scene.RegisterModuleInterface<IPresenceService>(this);
+            m_PresenceDetector.AddRegion(scene);
+            m_log.InfoFormat("[LOCAL PRESENCE CONNECTOR]: Enabled local presence for region {0}", scene.RegionInfo.RegionName);
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+            m_PresenceDetector.RemoveRegion(scene);
+        }
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+        }
+        #endregion
+        #region IPresenceService
+        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
+        {
+            m_log.Warn("[LOCAL PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
+            return false;
+        }
+        public bool LogoutAgent(UUID sessionID)
+        {
+            return m_PresenceService.LogoutAgent(sessionID);
+        }
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            return m_PresenceService.LogoutRegionAgents(regionID);
+        }
+        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_PresenceService.ReportAgent(sessionID, regionID, position, lookAt);
+        }
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            return m_PresenceService.GetAgent(sessionID);
+        }
+        public PresenceInfo[] GetAgents(string[] userIDs)
+        {
+            return m_PresenceService.GetAgents(userIDs);
+        }
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_PresenceService.SetHomeLocation(userID, regionID, position, lookAt);
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
new file mode 100644
index 0000000..3ca5560
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -0,0 +1,84 @@
+/*
+ * 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 OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using log4net;
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
+{
+    public class PresenceDetector 
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IPresenceService m_PresenceService;
+        public PresenceDetector(IPresenceService presenceservice)
+        {
+            m_PresenceService = presenceservice;
+        }
+        public void AddRegion(Scene scene)
+        {
+            scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
+            scene.EventManager.OnNewClient += OnNewClient;
+            m_PresenceService.LogoutRegionAgents(scene.RegionInfo.RegionID);
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnMakeRootAgent -= OnMakeRootAgent;
+            scene.EventManager.OnNewClient -= OnNewClient;
+            m_PresenceService.LogoutRegionAgents(scene.RegionInfo.RegionID);
+        }
+        public void OnMakeRootAgent(ScenePresence sp)
+        {
+            m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
+            m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+        }
+        public void OnNewClient(IClientAPI client)
+        {
+            client.OnLogout += OnLogout;
+        }
+        public void OnLogout(IClientAPI client)
+        {
+            client.OnLogout -= OnLogout;
+            m_PresenceService.LogoutAgent(client.SessionId);
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
new file mode 100644
index 0000000..e8e140a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
@@ -0,0 +1,164 @@
+/*
+ * 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 OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
+{
+    public class RemotePresenceServicesConnector : ISharedRegionModule, IPresenceService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        #region ISharedRegionModule
+        private bool m_Enabled = false;
+        private PresenceDetector m_PresenceDetector;
+        private IPresenceService m_RemoteConnector;
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public string Name
+        {
+            get { return "RemotePresenceServiceConnector"; }
+        }
+        public void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("PresenceServices", "");
+                if (name == Name)
+                {
+                    m_RemoteConnector = new PresenceServicesConnector(source);
+                    m_Enabled = true;
+                    m_PresenceDetector = new PresenceDetector(this);
+                    m_log.Info("[INVENTORY CONNECTOR]: Remote presence enabled");
+                }
+            }
+        }
+        public void PostInitialise()
+        {
+        }
+        public void Close()
+        {
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+            scene.RegisterModuleInterface<IPresenceService>(this);
+            m_PresenceDetector.AddRegion(scene);
+            m_log.InfoFormat("[REMOTE PRESENCE CONNECTOR]: Enabled remote presence for region {0}", scene.RegionInfo.RegionName);
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+            m_PresenceDetector.RemoveRegion(scene);
+        }
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+        }
+        #endregion
+        #region IPresenceService
+        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
+        {
+            m_log.Warn("[REMOTE PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
+            return false;
+        }
+        public bool LogoutAgent(UUID sessionID)
+        {
+            return m_RemoteConnector.LogoutAgent(sessionID);
+        }
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            return m_RemoteConnector.LogoutRegionAgents(regionID);
+        }
+        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_RemoteConnector.ReportAgent(sessionID, regionID, position, lookAt);
+        }
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            return m_RemoteConnector.GetAgent(sessionID);
+        }
+        public PresenceInfo[] GetAgents(string[] userIDs)
+        {
+            return m_RemoteConnector.GetAgents(userIDs);
+        }
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_RemoteConnector.SetHomeLocation(userID, regionID, position, lookAt);
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
new file mode 100644
index 0000000..ebb2c3e
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -0,0 +1,104 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Threading;
+using log4net.Config;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Nini.Config;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence;
+using OpenSim.Region.Framework.Scenes;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Setup;
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
+{
+    [TestFixture]
+    public class PresenceConnectorsTests
+    {
+        LocalPresenceServicesConnector m_LocalConnector;
+        private void SetUp()
+        {
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.AddConfig("PresenceService");
+            config.Configs["Modules"].Set("PresenceServices", "LocalPresenceServicesConnector");
+            config.Configs["PresenceService"].Set("LocalServiceModule", "OpenSim.Services.PresenceService.dll:PresenceService");
+            config.Configs["PresenceService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullPresenceData");
+            m_LocalConnector = new LocalPresenceServicesConnector(config);
+        }
+        /// <summary>
+        /// Test OpenSim Presence.
+        /// </summary>
+        [Test]
+        public void TestPresenceV0_1()
+        {
+            SetUp();
+            string user1 = UUID.Zero.ToString();
+            UUID session1 = UUID.Zero;
+            // this is not implemented by this connector
+            //m_LocalConnector.LoginAgent(user1, session1, UUID.Zero);
+            PresenceInfo result = m_LocalConnector.GetAgent(session1);
+            Assert.IsNotNull(result, "Retrieved GetAgent is null");
+            Assert.That(result.UserID, Is.EqualTo(user1), "Retrieved userID does not match");
+            Assert.IsTrue(result.Online, "Agent just logged in but is offline");
+            UUID region1 = UUID.Random();
+            bool r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero);
+            Assert.IsTrue(r, "First ReportAgent returned false");
+            result = m_LocalConnector.GetAgent(session1);
+            Assert.That(result.RegionID, Is.EqualTo(region1), "Agent is not in the right region (region1)");
+            UUID region2 = UUID.Random();
+            r = m_LocalConnector.ReportAgent(session1, region2, Vector3.Zero, Vector3.Zero);
+            Assert.IsTrue(r, "Second ReportAgent returned false");
+            result = m_LocalConnector.GetAgent(session1);
+            Assert.That(result.RegionID, Is.EqualTo(region2), "Agent is not in the right region (region2)");
+            r = m_LocalConnector.LogoutAgent(session1);
+            Assert.IsTrue(r, "LogoutAgent returned false");
+            result = m_LocalConnector.GetAgent(session1);
+            Assert.IsNotNull(result, "Agent session disappeared from storage after logout");
+            Assert.IsFalse(result.Online, "Agent is reported to be Online after logout");
+            r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero);
+            Assert.IsFalse(r, "ReportAgent of non-logged in user returned true");
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index cca5bb4..f55de5a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -26,6 +26,7 @@
 */
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -34,9 +35,11 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
+using OpenMetaverse;
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
-    public class LocalUserServicesConnector : ISharedRegionModule
+    public class LocalUserAccountServicesConnector : ISharedRegionModule, IUserAccountService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -46,6 +49,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
        private bool m_Enabled = false;
+        #region ISharedRegionModule
        public Type ReplaceableInterface 
        {
            get { return null; }
@@ -53,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
        public string Name
        {
-            get { return "LocalUserServicesConnector"; }
+            get { return "LocalUserAccountServicesConnector"; }
        }
        public void Initialise(IConfigSource source)
@@ -61,13 +66,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
            IConfig moduleConfig = source.Configs["Modules"];
            if (moduleConfig != null)
            {
-                string name = moduleConfig.GetString("UserServices", "");
+                string name = moduleConfig.GetString("UserAccountServices", "");
                if (name == Name)
                {
-                    IConfig userConfig = source.Configs["UserService"];
+                    IConfig userConfig = source.Configs["UserAccountService"];
                    if (userConfig == null)
                    {
-                        m_log.Error("[USER CONNECTOR]: UserService missing from OpenSim.ini");
+                        m_log.Error("[USER CONNECTOR]: UserAccountService missing from OpenSim.ini");
                        return;
                    }
@@ -87,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
                    if (m_UserService == null)
                    {
-                        m_log.Error("[USER CONNECTOR]: Can't load user service");
+                        m_log.Error("[USER CONNECTOR]: Can't load user account service");
                        return;
                    }
                    m_Enabled = true;
@@ -127,5 +132,39 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
            if (!m_Enabled)
                return;
        }
+        #endregion
+        #region IUserAccountService
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+        {
+            return m_UserService.GetUserAccount(scopeID, userID);
+        }
+        public UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName)
+        {
+            return m_UserService.GetUserAccount(scopeID, FirstName, LastName);
+        }
+        public UserAccount GetUserAccount(UUID scopeID, string Email)
+        {
+            return m_UserService.GetUserAccount(scopeID, Email);
+        }
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+        {
+            return m_UserService.GetUserAccounts(scopeID, query);
+        }
+        // Update all updatable fields
+        //
+        public bool StoreUserAccount(UserAccount data)
+        {
+            return m_UserService.StoreUserAccount(data);
+        }
+        #endregion
    }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index cef9129..d322aba 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -34,9 +34,9 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors;
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
-    public class RemoteUserServicesConnector : UserServicesConnector,
+    public class RemoteUserAccountServicesConnector : UserAccountServicesConnector,
            ISharedRegionModule, IUserAccountService
    {
        private static readonly ILog m_log =
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
        public string Name
        {
-            get { return "RemoteUserServicesConnector"; }
+            get { return "RemoteUserAccountServicesConnector"; }
        }
        public override void Initialise(IConfigSource source)
diff --git a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
index 630c6a3..d44c1e1 100644
--- a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
@@ -31,13 +31,13 @@ namespace OpenSim.Region.Framework.Interfaces
 {
    public struct PresenceInfo
    {
-        public UUID userID;
+        public string UserID;
-        public UUID regionID;
+        public UUID RegionID;
        
-        public PresenceInfo(UUID userID, UUID regionID)
+        public PresenceInfo(string userID, UUID regionID)
        {
-            this.userID = userID;
+            UserID = userID;
-            this.regionID = regionID;
+            RegionID = regionID;
        }
    }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0e1e2be..7db99e1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4889,5 +4889,15 @@ namespace OpenSim.Region.Framework.Scenes
            if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000)
                StartTimer();
        }
+        public override ISceneObject DeserializeObject(string representation)
+        {
+            return SceneObjectSerializer.FromXml2Format(representation);
+        }
+        public override bool AllowScriptCrossings
+        {
+            get { return m_allowScriptCrossings; }
+        }
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 1547f9a..19eea1e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -510,5 +510,16 @@ namespace OpenSim.Region.Framework.Scenes
            MainConsole.Instance.Commands.AddCommand(modulename, shared, command, shorthelp, longhelp, callback);
        }
+        public virtual ISceneObject DeserializeObject(string representation)
+        {
+            return null;
+        }
+        public virtual bool AllowScriptCrossings
+        {
+            get { return false; }
+        }
    }
 }
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 0964caa..a5d28a4 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -160,9 +160,9 @@ namespace OpenSim.Server.Base
            }
        }
-        public static Dictionary<string, string> ParseQueryString(string query)
+        public static Dictionary<string, object> ParseQueryString(string query)
        {
-            Dictionary<string, string> result = new Dictionary<string, string>();
+            Dictionary<string, object> result = new Dictionary<string, object>();
            string[] terms = query.Split(new char[] {'&'});
            if (terms.Length == 0)
@@ -180,33 +180,76 @@ namespace OpenSim.Server.Base
                if (elems.Length > 1)
                    value = System.Web.HttpUtility.UrlDecode(elems[1]);
-                result[name] = value;
+                if (name.EndsWith("[]"))
+                {
+                    if (result.ContainsKey(name))
+                    {
+                        if (!(result[name] is List<string>))
+                            continue;
+                        List<string> l = (List<string>)result[name];
+                        l.Add(value);
+                    }
+                    else
+                    {
+                        List<string> newList = new List<string>();
+                        newList.Add(value);
+                        result[name] = newList;
+                    }
+                }
+                else
+                {
+                    if (!result.ContainsKey(name))
+                        result[name] = value;
+                }
            }
            return result;
        }
-        public static string BuildQueryString(Dictionary<string, string> data)
+        public static string BuildQueryString(Dictionary<string, object> data)
        {
            string qstring = String.Empty;
-            foreach (KeyValuePair<string, string> kvp in data)
+            string part;
+            foreach (KeyValuePair<string, object> kvp in data)
            {
-                string part;
+                if (kvp.Value is List<string>)
-                if (kvp.Value != String.Empty)
                {
-                    part = System.Web.HttpUtility.UrlEncode(kvp.Key) +
+                    List<string> l = (List<String>)kvp.Value;
-                            "=" + System.Web.HttpUtility.UrlEncode(kvp.Value);
+                    foreach (string s in l)
+                    {
+                        part = System.Web.HttpUtility.UrlEncode(kvp.Key) +
+                                "[]=" + System.Web.HttpUtility.UrlEncode(s);
+                        if (qstring != String.Empty)
+                            qstring += "&";
+                        qstring += part;
+                    }
                }
                else
                {
-                    part = System.Web.HttpUtility.UrlEncode(kvp.Key);
+                    if (kvp.Value.ToString() != String.Empty)
-                }
+                    {
+                        part = System.Web.HttpUtility.UrlEncode(kvp.Key) +
+                                "=" + System.Web.HttpUtility.UrlEncode(kvp.Value.ToString());
+                    }
+                    else
+                    {
+                        part = System.Web.HttpUtility.UrlEncode(kvp.Key);
+                    }
-                if (qstring != String.Empty)
+                    if (qstring != String.Empty)
-                    qstring += "&";
+                        qstring += "&";
-                qstring += part;
+                    qstring += part;
+                }
            }
            return qstring;
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index 490a13a..47bc860 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -86,14 +86,14 @@ namespace OpenSim.Server.Handlers.Authentication
        private byte[] DoPlainMethods(string body)
        {
-            Dictionary<string, string> request =
+            Dictionary<string, object> request =
                    ServerUtils.ParseQueryString(body);
            int lifetime = 30;
            if (request.ContainsKey("LIFETIME"))
            {
-                lifetime = Convert.ToInt32(request["LIFETIME"]);
+                lifetime = Convert.ToInt32(request["LIFETIME"].ToString());
                if (lifetime > 30)
                    lifetime = 30;
            }
@@ -103,12 +103,12 @@ namespace OpenSim.Server.Handlers.Authentication
            if (!request.ContainsKey("PRINCIPAL"))
                return FailureResult();
-            string method = request["METHOD"];
+            string method = request["METHOD"].ToString();
            UUID principalID;
            string token;
-            if (!UUID.TryParse(request["PRINCIPAL"], out principalID))
+            if (!UUID.TryParse(request["PRINCIPAL"].ToString(), out principalID))
                return FailureResult();
            switch (method)
@@ -117,7 +117,7 @@ namespace OpenSim.Server.Handlers.Authentication
                if (!request.ContainsKey("PASSWORD"))
                    return FailureResult();
                
-                token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"], lifetime);
+                token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"].ToString(), lifetime);
                if (token != String.Empty)
                    return SuccessResult(token);
@@ -126,7 +126,7 @@ namespace OpenSim.Server.Handlers.Authentication
                if (!request.ContainsKey("TOKEN"))
                    return FailureResult();
                
-                if (m_AuthenticationService.Verify(principalID, request["TOKEN"], lifetime))
+                if (m_AuthenticationService.Verify(principalID, request["TOKEN"].ToString(), lifetime))
                    return SuccessResult();
                return FailureResult();
@@ -134,7 +134,7 @@ namespace OpenSim.Server.Handlers.Authentication
                if (!request.ContainsKey("TOKEN"))
                    return FailureResult();
-                if (m_AuthenticationService.Release(principalID, request["TOKEN"]))
+                if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString()))
                    return SuccessResult();
                return FailureResult();
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 433ed0b..d99b791 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -69,13 +69,13 @@ namespace OpenSim.Server.Handlers.Grid
            try
            {
-                Dictionary<string, string> request =
+                Dictionary<string, object> request =
                        ServerUtils.ParseQueryString(body);
                if (!request.ContainsKey("METHOD"))
                    return FailureResult();
-                string method = request["METHOD"];
+                string method = request["METHOD"].ToString();
                switch (method)
                {
@@ -117,22 +117,22 @@ namespace OpenSim.Server.Handlers.Grid
        #region Method-specific handlers
-        byte[] Register(Dictionary<string, string> request)
+        byte[] Register(Dictionary<string, object> request)
        {
            UUID scopeID = UUID.Zero;
            if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to register region");
            int versionNumberMin = 0, versionNumberMax = 0;
            if (request.ContainsKey("VERSIONMIN"))
-                Int32.TryParse(request["VERSIONMIN"], out versionNumberMin);
+                Int32.TryParse(request["VERSIONMIN"].ToString(), out versionNumberMin);
            else
                m_log.WarnFormat("[GRID HANDLER]: no minimum protocol version in request to register region");
            if (request.ContainsKey("VERSIONMAX"))
-                Int32.TryParse(request["VERSIONMAX"], out versionNumberMax);
+                Int32.TryParse(request["VERSIONMAX"].ToString(), out versionNumberMax);
            else
                m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region");
@@ -147,8 +147,8 @@ namespace OpenSim.Server.Handlers.Grid
            GridRegion rinfo = null;
            try
            {
-                foreach (KeyValuePair<string, string> kvp in request)
+                foreach (KeyValuePair<string, object> kvp in request)
-                    rinfoData[kvp.Key] = kvp.Value;
+                    rinfoData[kvp.Key] = kvp.Value.ToString();
                rinfo = new GridRegion(rinfoData);
            }
            catch (Exception e)
@@ -166,11 +166,11 @@ namespace OpenSim.Server.Handlers.Grid
                return FailureResult();
        }
-        byte[] Deregister(Dictionary<string, string> request)
+        byte[] Deregister(Dictionary<string, object> request)
        {
            UUID regionID = UUID.Zero;
-            if (request["REGIONID"] != null)
+            if (request.ContainsKey("REGIONID"))
-                UUID.TryParse(request["REGIONID"], out regionID);
+                UUID.TryParse(request["REGIONID"].ToString(), out regionID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to deregister region");
@@ -183,17 +183,17 @@ namespace OpenSim.Server.Handlers.Grid
        }
-        byte[] GetNeighbours(Dictionary<string, string> request)
+        byte[] GetNeighbours(Dictionary<string, object> request)
        {
            UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
+            if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours");
            UUID regionID = UUID.Zero;
-            if (request["REGIONID"] != null)
+            if (request.ContainsKey("REGIONID"))
-                UUID.TryParse(request["REGIONID"], out regionID);
+                UUID.TryParse(request["REGIONID"].ToString(), out regionID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
@@ -221,17 +221,17 @@ namespace OpenSim.Server.Handlers.Grid
        }
-        byte[] GetRegionByUUID(Dictionary<string, string> request)
+        byte[] GetRegionByUUID(Dictionary<string, object> request)
        {
            UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
+            if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours");
            UUID regionID = UUID.Zero;
-            if (request["REGIONID"] != null)
+            if (request.ContainsKey("REGIONID"))
-                UUID.TryParse(request["REGIONID"], out regionID);
+                UUID.TryParse(request["REGIONID"].ToString(), out regionID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
@@ -250,21 +250,21 @@ namespace OpenSim.Server.Handlers.Grid
            return encoding.GetBytes(xmlString);
        }
-        byte[] GetRegionByPosition(Dictionary<string, string> request)
+        byte[] GetRegionByPosition(Dictionary<string, object> request)
        {
            UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
+            if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region by position");
            int x = 0, y = 0;
-            if (request["X"] != null)
+            if (request.ContainsKey("X"))
-                Int32.TryParse(request["X"], out x);
+                Int32.TryParse(request["X"].ToString(), out x);
            else
                m_log.WarnFormat("[GRID HANDLER]: no X in request to get region by position");
-            if (request["Y"] != null)
+            if (request.ContainsKey("Y"))
-                Int32.TryParse(request["Y"], out y);
+                Int32.TryParse(request["Y"].ToString(), out y);
            else
                m_log.WarnFormat("[GRID HANDLER]: no Y in request to get region by position");
@@ -283,17 +283,17 @@ namespace OpenSim.Server.Handlers.Grid
            return encoding.GetBytes(xmlString);
        }
-        byte[] GetRegionByName(Dictionary<string, string> request)
+        byte[] GetRegionByName(Dictionary<string, object> request)
        {
            UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
+            if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region by name");
            string regionName = string.Empty;
-            if (request["NAME"] != null)
+            if (request.ContainsKey("NAME"))
-                regionName = request["NAME"];
+                regionName = request["NAME"].ToString();
            else
                m_log.WarnFormat("[GRID HANDLER]: no name in request to get region by name");
@@ -312,23 +312,23 @@ namespace OpenSim.Server.Handlers.Grid
            return encoding.GetBytes(xmlString);
        }
-        byte[] GetRegionsByName(Dictionary<string, string> request)
+        byte[] GetRegionsByName(Dictionary<string, object> request)
        {
            UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
+            if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get regions by name");
            string regionName = string.Empty;
-            if (request["NAME"] != null)
+            if (request.ContainsKey("NAME"))
-                regionName = request["NAME"];
+                regionName = request["NAME"].ToString();
            else
                m_log.WarnFormat("[GRID HANDLER]: no NAME in request to get regions by name");
            int max = 0;
-            if (request["MAX"] != null)
+            if (request.ContainsKey("MAX"))
-                Int32.TryParse(request["MAX"], out max);
+                Int32.TryParse(request["MAX"].ToString(), out max);
            else
                m_log.WarnFormat("[GRID HANDLER]: no MAX in request to get regions by name");
@@ -355,30 +355,30 @@ namespace OpenSim.Server.Handlers.Grid
            return encoding.GetBytes(xmlString);
        }
-        byte[] GetRegionRange(Dictionary<string, string> request)
+        byte[] GetRegionRange(Dictionary<string, object> request)
        {
            //m_log.DebugFormat("[GRID HANDLER]: GetRegionRange");
            UUID scopeID = UUID.Zero;
            if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
            else
                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region range");
            int xmin = 0, xmax = 0, ymin = 0, ymax = 0;
            if (request.ContainsKey("XMIN"))
-                Int32.TryParse(request["XMIN"], out xmin);
+                Int32.TryParse(request["XMIN"].ToString(), out xmin);
            else
                m_log.WarnFormat("[GRID HANDLER]: no XMIN in request to get region range");
            if (request.ContainsKey("XMAX"))
-                Int32.TryParse(request["XMAX"], out xmax);
+                Int32.TryParse(request["XMAX"].ToString(), out xmax);
            else
                m_log.WarnFormat("[GRID HANDLER]: no XMAX in request to get region range");
            if (request.ContainsKey("YMIN"))
-                Int32.TryParse(request["YMIN"], out ymin);
+                Int32.TryParse(request["YMIN"].ToString(), out ymin);
            else
                m_log.WarnFormat("[GRID HANDLER]: no YMIN in request to get region range");
            if (request.ContainsKey("YMAX"))
-                Int32.TryParse(request["YMAX"], out ymax);
+                Int32.TryParse(request["YMAX"].ToString(), out ymax);
            else
                m_log.WarnFormat("[GRID HANDLER]: no YMAX in request to get region range");
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
new file mode 100644
index 0000000..b973c11
--- /dev/null
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -0,0 +1,139 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Net;
+using System.Text;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using Nwc.XmlRpc;
+using Nini.Config;
+using log4net;
+namespace OpenSim.Server.Handlers.Login
+{
+    public class LLLoginHandlers
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private ILoginService m_LocalService;
+        public LLLoginHandlers(ILoginService service)
+        {
+            m_LocalService = service;
+        }
+        public XmlRpcResponse HandleXMLRPCLogin(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            if (requestData != null)
+            {
+                if (requestData.ContainsKey("first") && requestData["first"] != null &&
+                    requestData.ContainsKey("last") && requestData["last"] != null &&
+                    requestData.ContainsKey("passwd") && requestData["passwd"] != null)
+                {
+                    string startLocation = string.Empty;
+                    if (requestData.ContainsKey("start"))
+                        startLocation = requestData["start"].ToString();
+                    LoginResponse reply = null;
+                    reply = m_LocalService.Login(requestData["first"].ToString(), requestData["last"].ToString(), requestData["passwd"].ToString(), startLocation);
+                    XmlRpcResponse response = new XmlRpcResponse();
+                    response.Value = reply.ToHashtable();
+                    return response;
+                }
+            }
+            return FailedXMLRPCResponse();
+        }
+        public OSD HandleLLSDLogin(OSD request, IPEndPoint remoteClient)
+        {
+            if (request.Type == OSDType.Map)
+            {
+                OSDMap map = (OSDMap)request;
+                if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd"))
+                {
+                    string startLocation = string.Empty;
+                    if (map.ContainsKey("start"))
+                        startLocation = map["start"].AsString();
+                    m_log.Info("[LOGIN]: LLSD Login Requested for: '" + map["first"].AsString() + "' '" + map["last"].AsString() + "' / " + startLocation);
+                    LoginResponse reply = null;
+                    reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation);
+                    return reply.ToOSDMap();
+                }
+            }
+            return FailedOSDResponse();
+        }
+        private XmlRpcResponse FailedXMLRPCResponse()
+        {
+            Hashtable hash = new Hashtable();
+            hash["reason"] = "key";
+            hash["message"] = "Incomplete login credentials. Check your username and password.";
+            hash["login"] = "false";
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = hash;
+            return response;
+        }
+        private OSD FailedOSDResponse()
+        {
+            OSDMap map = new OSDMap();
+            map["reason"] = OSD.FromString("key");
+            map["message"] = OSD.FromString("Invalid login credentials. Check your username and passwd.");
+            map["login"] = OSD.FromString("false");
+            return map;
+        }
+    }
+}
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
new file mode 100644
index 0000000..42ecd4d
--- /dev/null
+++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
@@ -0,0 +1,93 @@
+/*
+ * 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 OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+namespace OpenSim.Server.Handlers.Login
+{
+    public class LLLoginServiceInConnector : ServiceConnector
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private ILoginService m_LoginService;
+        public LLLoginServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) :
+                base(config, server, String.Empty)
+        {
+            string loginService = ReadLocalServiceFromConfig(config);
+            ISimulationService simService = scene.RequestModuleInterface<ISimulationService>();
+            Object[] args = new Object[] { config, simService };
+            m_LoginService = ServerUtils.LoadPlugin<ILoginService>(loginService, args);
+            InitializeHandlers(server);
+        }
+        public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) :
+            base(config, server, String.Empty)
+        {
+            string loginService = ReadLocalServiceFromConfig(config);
+            Object[] args = new Object[] { config };
+            m_LoginService = ServerUtils.LoadPlugin<ILoginService>(loginService, args);
+            InitializeHandlers(server);
+        }
+        private string ReadLocalServiceFromConfig(IConfigSource config)
+        {
+            IConfig serverConfig = config.Configs["LoginService"];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section LoginService in config file"));
+            string loginService = serverConfig.GetString("LocalServiceModule", String.Empty);
+            if (loginService == string.Empty)
+                throw new Exception(String.Format("No LocalServiceModule for LoginService in config file"));
+            return loginService;
+        }
+        private void InitializeHandlers(IHttpServer server)
+        {
+            LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService);
+            server.AddXmlRPCHandler("Login_to_simulator", loginHandlers.HandleXMLRPCLogin, false);
+            server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin);
+        }
+    }
+}
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 2558fa0..11adc4a 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -68,18 +68,30 @@ namespace OpenSim.Server.Handlers.Presence
            try
            {
-                Dictionary<string, string> request =
+                Dictionary<string, object> request =
                        ServerUtils.ParseQueryString(body);
                if (!request.ContainsKey("METHOD"))
                    return FailureResult();
-                string method = request["METHOD"];
+                string method = request["METHOD"].ToString();
                switch (method)
                {
+                    case "login":
+                        return LoginAgent(request);
+                    case "logout":
+                        return LogoutAgent(request);
+                    case "logoutregion":
+                        return LogoutRegionAgents(request);
                    case "report":
                        return Report(request);
+                    case "getagent":
+                        return GetAgent(request);
+                    case "getagents":
+                        return GetAgents(request);
+                    case "sethome":
+                        return SetHome(request);
                }
                m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method);
            }
@@ -92,38 +104,153 @@ namespace OpenSim.Server.Handlers.Presence
        }
-        byte[] Report(Dictionary<string, string> request)
+        byte[] LoginAgent(Dictionary<string, object> request)
        {
-            PresenceInfo info = new PresenceInfo();
+            string user = String.Empty;
-            info.Data = new Dictionary<string, string>();
+            UUID session = UUID.Zero;
+            UUID ssession = UUID.Zero;
-            if (request["PrincipalID"] == null || request["RegionID"] == null)
+            if (!request.ContainsKey("UserID") || !request.ContainsKey("SessionID"))
                return FailureResult();
-            if (!UUID.TryParse(request["PrincipalID"].ToString(),
+            user = request["UserID"].ToString();
-                    out info.PrincipalID))
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
                return FailureResult();
-            if (!UUID.TryParse(request["RegionID"].ToString(),
+            if (request.ContainsKey("SecureSessionID"))
-                    out info.RegionID))
+                // If it's malformed, we go on with a Zero on it
+                UUID.TryParse(request["SecureSessionID"].ToString(), out ssession);
+            if (m_PresenceService.LoginAgent(user, session, ssession))
+                return SuccessResult();
+            return FailureResult();
+        }
+        byte[] LogoutAgent(Dictionary<string, object> request)
+        {
+            UUID session = UUID.Zero;
+            if (!request.ContainsKey("SessionID"))
                return FailureResult();
-            foreach (KeyValuePair<string, string> kvp in request)
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
-            {
+                return FailureResult();
-                if (kvp.Key == "METHOD" ||
-                        kvp.Key == "PrincipalID" ||
-                        kvp.Key == "RegionID")
-                    continue;
-                info.Data[kvp.Key] = kvp.Value;
+            if (m_PresenceService.LogoutAgent(session))
-            }
+                return SuccessResult();
+            return FailureResult();
+        }
+        byte[] LogoutRegionAgents(Dictionary<string, object> request)
+        {
+            UUID region = UUID.Zero;
+            if (!request.ContainsKey("RegionID"))
+                return FailureResult();
-            if (m_PresenceService.Report(info))
+            if (!UUID.TryParse(request["RegionID"].ToString(), out region))
+                return FailureResult();
+            if (m_PresenceService.LogoutRegionAgents(region))
                return SuccessResult();
            return FailureResult();
        }
+        
+        byte[] Report(Dictionary<string, object> request)
+        {
+            UUID session = UUID.Zero;
+            UUID region = UUID.Zero;
+            Vector3 position = new Vector3(128, 128, 70);
+            Vector3 look = Vector3.Zero;
+            if (!request.ContainsKey("SessionID") || !request.ContainsKey("RegionID"))
+                return FailureResult();
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
+                return FailureResult();
+            if (!UUID.TryParse(request["RegionID"].ToString(), out region))
+                return FailureResult();
+            if (request.ContainsKey("position"))
+                Vector3.TryParse(request["position"].ToString(), out position);
+            if (request.ContainsKey("lookAt"))
+                Vector3.TryParse(request["lookAt"].ToString(), out look);
+            
+            if (m_PresenceService.ReportAgent(session, region, position, look))
+                return SuccessResult();
+            return FailureResult();
+        }
+        byte[] GetAgent(Dictionary<string, object> request)
+        {
+            UUID session = UUID.Zero;
+            if (!request.ContainsKey("SessionID"))
+                return FailureResult();
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
+                return FailureResult();
+            PresenceInfo pinfo = m_PresenceService.GetAgent(session);
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if (pinfo == null)
+                result["result"] = "null";
+            else
+                result["result"] = pinfo.ToKeyValuePairs();
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+        byte[] GetAgents(Dictionary<string, object> request)
+        {
+            string[] userIDs;
+            if (!request.ContainsKey("uuids"))
+                return FailureResult();
+            if (!(request["uuids"] is List<string>))
+            {
+                m_log.DebugFormat("[PRESENCE HANDLER]: GetAgents input argument was of unexpected type {0}", request["uuids"].GetType().ToString());
+                return FailureResult();
+            }
+            userIDs = ((List<string>)request["uuids"]).ToArray();
+            PresenceInfo[] pinfos = m_PresenceService.GetAgents(userIDs);
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((pinfos == null) || ((pinfos != null) && (pinfos.Length == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (PresenceInfo pinfo in pinfos)
+                {
+                    Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs();
+                    result["presence" + i] = rinfoDict;
+                    i++;
+                }
+            }
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+        
        private byte[] SuccessResult()
        {
            XmlDocument doc = new XmlDocument();
@@ -138,7 +265,7 @@ namespace OpenSim.Server.Handlers.Presence
            doc.AppendChild(rootElement);
-            XmlElement result = doc.CreateElement("", "Result", "");
+            XmlElement result = doc.CreateElement("", "result", "");
            result.AppendChild(doc.CreateTextNode("Success"));
            rootElement.AppendChild(result);
@@ -160,7 +287,7 @@ namespace OpenSim.Server.Handlers.Presence
            doc.AppendChild(rootElement);
-            XmlElement result = doc.CreateElement("", "Result", "");
+            XmlElement result = doc.CreateElement("", "result", "");
            result.AppendChild(doc.CreateTextNode("Failure"));
            rootElement.AppendChild(result);
@@ -178,5 +305,32 @@ namespace OpenSim.Server.Handlers.Presence
            return ms.ToArray();
        }
+        byte[] SetHome(Dictionary<string, object> request)
+        {
+            UUID region = UUID.Zero;
+            Vector3 position = new Vector3(128, 128, 70);
+            Vector3 look = Vector3.Zero;
+            if (!request.ContainsKey("SessionID") || !request.ContainsKey("RegionID"))
+                return FailureResult();
+            string user = request["UserID"].ToString();
+            if (!UUID.TryParse(request["RegionID"].ToString(), out region))
+                return FailureResult();
+            if (request.ContainsKey("position"))
+                Vector3.TryParse(request["position"].ToString(), out position);
+            if (request.ContainsKey("lookAt"))
+                Vector3.TryParse(request["lookAt"].ToString(), out look);
+            
+            if (m_PresenceService.SetHomeLocation(user, region, position, look))
+                return SuccessResult();
+            return FailureResult();
+        }
    }
 }
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 3da72c7..4966f66 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -26,6 +26,7 @@
 */
 using System;
+using System.Collections;
 using System.IO;
 using System.Reflection;
 using System.Net;
@@ -45,6 +46,247 @@ using log4net;
 namespace OpenSim.Server.Handlers.Simulation
 {
+    public class AgentHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private ISimulationService m_SimulationService;
+        public AgentHandler(ISimulationService sim)
+        {
+            m_SimulationService = sim;
+        }
+        public Hashtable Handler(Hashtable request)
+        {
+            //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
+            m_log.Debug("---------------------------");
+            m_log.Debug(" >> uri=" + request["uri"]);
+            m_log.Debug(" >> content-type=" + request["content-type"]);
+            m_log.Debug(" >> http-method=" + request["http-method"]);
+            m_log.Debug("---------------------------\n");
+            Hashtable responsedata = new Hashtable();
+            responsedata["content_type"] = "text/html";
+            responsedata["keepalive"] = false;
+            UUID agentID;
+            string action;
+            ulong regionHandle;
+            if (!Utils.GetParams((string)request["uri"], out agentID, out regionHandle, out action))
+            {
+                m_log.InfoFormat("[AGENT HANDLER]: Invalid parameters for agent message {0}", request["uri"]);
+                responsedata["int_response_code"] = 404;
+                responsedata["str_response_string"] = "false";
+                return responsedata;
+            }
+            // Next, let's parse the verb
+            string method = (string)request["http-method"];
+            if (method.Equals("PUT"))
+            {
+                DoAgentPut(request, responsedata);
+                return responsedata;
+            }
+            else if (method.Equals("POST"))
+            {
+                DoAgentPost(request, responsedata, agentID);
+                return responsedata;
+            }
+            else if (method.Equals("GET"))
+            {
+                DoAgentGet(request, responsedata, agentID, regionHandle);
+                return responsedata;
+            }
+            else if (method.Equals("DELETE"))
+            {
+                DoAgentDelete(request, responsedata, agentID, action, regionHandle);
+                return responsedata;
+            }
+            else
+            {
+                m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method);
+                responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed;
+                responsedata["str_response_string"] = "Method not allowed";
+                return responsedata;
+            }
+        }
+        protected virtual void DoAgentPost(Hashtable request, Hashtable responsedata, UUID id)
+        {
+            OSDMap args = Utils.GetOSDMap((string)request["body"]);
+            if (args == null)
+            {
+                responsedata["int_response_code"] = HttpStatusCode.BadRequest;
+                responsedata["str_response_string"] = "Bad request";
+                return;
+            }
+            // retrieve the regionhandle
+            ulong regionhandle = 0;
+            if (args["destination_handle"] != null)
+                UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
+            AgentCircuitData aCircuit = new AgentCircuitData();
+            try
+            {
+                aCircuit.UnpackAgentCircuitData(args);
+            }
+            catch (Exception ex)
+            {
+                m_log.InfoFormat("[AGENT HANDLER]: exception on unpacking ChildCreate message {0}", ex.Message);
+                responsedata["int_response_code"] = HttpStatusCode.BadRequest;
+                responsedata["str_response_string"] = "Bad request";
+                return;
+            }
+            OSDMap resp = new OSDMap(2);
+            string reason = String.Empty;
+            uint teleportFlags = 0;
+            if (args.ContainsKey("teleport_flags"))
+            {
+                teleportFlags = args["teleport_flags"].AsUInteger();
+            }
+            // This is the meaning of POST agent
+            //m_regionClient.AdjustUserInformation(aCircuit);
+            bool result = m_SimulationService.CreateAgent(regionhandle, aCircuit, teleportFlags, out reason);
+            resp["reason"] = OSD.FromString(reason);
+            resp["success"] = OSD.FromBoolean(result);
+            // TODO: add reason if not String.Empty?
+            responsedata["int_response_code"] = HttpStatusCode.OK;
+            responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp);
+        }
+        protected virtual void DoAgentPut(Hashtable request, Hashtable responsedata)
+        {
+            OSDMap args = Utils.GetOSDMap((string)request["body"]);
+            if (args == null)
+            {
+                responsedata["int_response_code"] = HttpStatusCode.BadRequest;
+                responsedata["str_response_string"] = "Bad request";
+                return;
+            }
+            // retrieve the regionhandle
+            ulong regionhandle = 0;
+            if (args["destination_handle"] != null)
+                UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
+            string messageType;
+            if (args["message_type"] != null)
+                messageType = args["message_type"].AsString();
+            else
+            {
+                m_log.Warn("[AGENT HANDLER]: Agent Put Message Type not found. ");
+                messageType = "AgentData";
+            }
+            bool result = true;
+            if ("AgentData".Equals(messageType))
+            {
+                AgentData agent = new AgentData();
+                try
+                {
+                    agent.Unpack(args);
+                }
+                catch (Exception ex)
+                {
+                    m_log.InfoFormat("[AGENT HANDLER]: exception on unpacking ChildAgentUpdate message {0}", ex.Message);
+                    responsedata["int_response_code"] = HttpStatusCode.BadRequest;
+                    responsedata["str_response_string"] = "Bad request";
+                    return;
+                }
+                //agent.Dump();
+                // This is one of the meanings of PUT agent
+                result = m_SimulationService.UpdateAgent(regionhandle, agent);
+            }
+            else if ("AgentPosition".Equals(messageType))
+            {
+                AgentPosition agent = new AgentPosition();
+                try
+                {
+                    agent.Unpack(args);
+                }
+                catch (Exception ex)
+                {
+                    m_log.InfoFormat("[AGENT HANDLER]: exception on unpacking ChildAgentUpdate message {0}", ex.Message);
+                    return;
+                }
+                //agent.Dump();
+                // This is one of the meanings of PUT agent
+                result = m_SimulationService.UpdateAgent(regionhandle, agent);
+            }
+            responsedata["int_response_code"] = HttpStatusCode.OK;
+            responsedata["str_response_string"] = result.ToString();
+            //responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp); ??? instead
+        }
+        protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, ulong regionHandle)
+        {
+            IAgentData agent = null;
+            bool result = m_SimulationService.RetrieveAgent(regionHandle, id, out agent);
+            OSDMap map = null;
+            if (result)
+            {
+                if (agent != null) // just to make sure
+                {
+                    map = agent.Pack();
+                    string strBuffer = "";
+                    try
+                    {
+                        strBuffer = OSDParser.SerializeJsonString(map);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[AGENT HANDLER]: Exception thrown on serialization of DoAgentGet: {0}", e.Message);
+                        responsedata["int_response_code"] = HttpStatusCode.InternalServerError;
+                        // ignore. buffer will be empty, caller should check.
+                    }
+                    responsedata["content_type"] = "application/json";
+                    responsedata["int_response_code"] = HttpStatusCode.OK;
+                    responsedata["str_response_string"] = strBuffer;
+                }
+                else
+                {
+                    responsedata["int_response_code"] = HttpStatusCode.InternalServerError;
+                    responsedata["str_response_string"] = "Internal error";
+                }
+            }
+            else
+            {
+                responsedata["int_response_code"] = HttpStatusCode.NotFound;
+                responsedata["str_response_string"] = "Not Found";
+            }
+        }
+        protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle)
+        {
+            //m_log.Debug(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle);
+            if (action.Equals("release"))
+                m_SimulationService.ReleaseAgent(regionHandle, id, "");
+            else
+                m_SimulationService.CloseAgent(regionHandle, id);
+            responsedata["int_response_code"] = HttpStatusCode.OK;
+            responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
+            m_log.Debug("[AGENT HANDLER]: Agent Deleted.");
+        }
+    }
    public class AgentGetHandler : BaseStreamHandler
    {
        // TODO: unused: private ISimulationService m_SimulationService;
@@ -153,7 +395,7 @@ namespace OpenSim.Server.Handlers.Simulation
            //    m_regionClient.AdjustUserInformation(aCircuit);
            // Finally!
-            bool success = m_SimulationService.CreateAgent(regionhandle, aCircuit, out reason);
+            bool success = m_SimulationService.CreateAgent(regionhandle, aCircuit, /*!!!*/0, out reason);
            OSDMap resp = new OSDMap(1);
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
new file mode 100644
index 0000000..8c3af72
--- /dev/null
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -0,0 +1,191 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using System.Net;
+using System.Text;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using Nini.Config;
+using log4net;
+namespace OpenSim.Server.Handlers.Simulation
+{
+    public class ObjectHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private ISimulationService m_SimulationService;
+        public ObjectHandler(ISimulationService sim)
+        {
+            m_SimulationService = sim;
+        }
+        public Hashtable Handler(Hashtable request)
+        {
+            m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called");
+            m_log.Debug("---------------------------");
+            m_log.Debug(" >> uri=" + request["uri"]);
+            m_log.Debug(" >> content-type=" + request["content-type"]);
+            m_log.Debug(" >> http-method=" + request["http-method"]);
+            m_log.Debug("---------------------------\n");
+            Hashtable responsedata = new Hashtable();
+            responsedata["content_type"] = "text/html";
+            UUID objectID;
+            string action;
+            ulong regionHandle;
+            if (!Utils.GetParams((string)request["uri"], out objectID, out regionHandle, out action))
+            {
+                m_log.InfoFormat("[REST COMMS]: Invalid parameters for object message {0}", request["uri"]);
+                responsedata["int_response_code"] = 404;
+                responsedata["str_response_string"] = "false";
+                return responsedata;
+            }
+            // Next, let's parse the verb
+            string method = (string)request["http-method"];
+            if (method.Equals("POST"))
+            {
+                DoObjectPost(request, responsedata, regionHandle);
+                return responsedata;
+            }
+            else if (method.Equals("PUT"))
+            {
+                DoObjectPut(request, responsedata, regionHandle);
+                return responsedata;
+            }
+            //else if (method.Equals("DELETE"))
+            //{
+            //    DoObjectDelete(request, responsedata, agentID, action, regionHandle);
+            //    return responsedata;
+            //}
+            else
+            {
+                m_log.InfoFormat("[REST COMMS]: method {0} not supported in object message", method);
+                responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed;
+                responsedata["str_response_string"] = "Mthod not allowed";
+                return responsedata;
+            }
+        }
+        protected virtual void DoObjectPost(Hashtable request, Hashtable responsedata, ulong regionhandle)
+        {
+            OSDMap args = Utils.GetOSDMap((string)request["body"]);
+            if (args == null)
+            {
+                responsedata["int_response_code"] = 400;
+                responsedata["str_response_string"] = "false";
+                return;
+            }
+            string sogXmlStr = "", extraStr = "", stateXmlStr = "";
+            if (args["sog"] != null)
+                sogXmlStr = args["sog"].AsString();
+            if (args["extra"] != null)
+                extraStr = args["extra"].AsString();
+            IScene s = m_SimulationService.GetScene(regionhandle);
+            ISceneObject sog = null;
+            try
+            {
+                //sog = SceneObjectSerializer.FromXml2Format(sogXmlStr);
+                sog = s.DeserializeObject(sogXmlStr);
+                sog.ExtraFromXmlString(extraStr);
+            }
+            catch (Exception ex)
+            {
+                m_log.InfoFormat("[REST COMMS]: exception on deserializing scene object {0}", ex.Message);
+                responsedata["int_response_code"] = HttpStatusCode.BadRequest;
+                responsedata["str_response_string"] = "Bad request";
+                return;
+            }
+            if ((args["state"] != null) && s.AllowScriptCrossings)
+            {
+                stateXmlStr = args["state"].AsString();
+                if (stateXmlStr != "")
+                {
+                    try
+                    {
+                        sog.SetState(stateXmlStr, s);
+                    }
+                    catch (Exception ex)
+                    {
+                        m_log.InfoFormat("[REST COMMS]: exception on setting state for scene object {0}", ex.Message);
+                        // ignore and continue
+                    }
+                }
+            }
+            // This is the meaning of POST object
+            bool result = m_SimulationService.CreateObject(regionhandle, sog, false);
+            responsedata["int_response_code"] = HttpStatusCode.OK;
+            responsedata["str_response_string"] = result.ToString();
+        }
+        protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, ulong regionhandle)
+        {
+            OSDMap args = Utils.GetOSDMap((string)request["body"]);
+            if (args == null)
+            {
+                responsedata["int_response_code"] = 400;
+                responsedata["str_response_string"] = "false";
+                return;
+            }
+            UUID userID = UUID.Zero, itemID = UUID.Zero;
+            if (args["userid"] != null)
+                userID = args["userid"].AsUUID();
+            if (args["itemid"] != null)
+                itemID = args["itemid"].AsUUID();
+            // This is the meaning of PUT object
+            bool result = m_SimulationService.CreateObject(regionhandle, userID, itemID);
+            responsedata["int_response_code"] = 200;
+            responsedata["str_response_string"] = result.ToString();
+        }
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
index fe93fa5..8611228 100644
--- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Server.Handlers.Simulation
 {
    public class SimulationServiceInConnector : ServiceConnector
    {
-        private ISimulationService m_SimulationService;
+        private ISimulationService m_LocalSimulationService;
        private IAuthenticationService m_AuthenticationService;
        public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) :
@@ -47,13 +47,6 @@ namespace OpenSim.Server.Handlers.Simulation
            if (serverConfig == null)
                throw new Exception("No section 'SimulationService' in config file");
-            bool authentication = serverConfig.GetBoolean("RequireAuthentication", false);
-            if (authentication)
-                m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
-            bool foreignGuests = serverConfig.GetBoolean("AllowForeignGuests", false);
            //string simService = serverConfig.GetString("LocalServiceModule",
            //        String.Empty);
@@ -61,20 +54,18 @@ namespace OpenSim.Server.Handlers.Simulation
            //    throw new Exception("No SimulationService in config file");
            //Object[] args = new Object[] { config };
-            m_SimulationService = scene.RequestModuleInterface<ISimulationService>();
+            m_LocalSimulationService = scene.RequestModuleInterface<ISimulationService>();
                    //ServerUtils.LoadPlugin<ISimulationService>(simService, args);
-            if (m_SimulationService == null)
-                throw new Exception("No Local ISimulationService Module");
            //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no"));
-            server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService));
+            //server.AddStreamHandler(new AgentGetHandler(m_SimulationService, m_AuthenticationService));
-            server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService, foreignGuests));
+            //server.AddStreamHandler(new AgentPostHandler(m_SimulationService, m_AuthenticationService));
-            server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService));
+            //server.AddStreamHandler(new AgentPutHandler(m_SimulationService, m_AuthenticationService));
-            server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService));
+            //server.AddStreamHandler(new AgentDeleteHandler(m_SimulationService, m_AuthenticationService));
+            server.AddHTTPHandler("/agent/", new AgentHandler(m_LocalSimulationService).Handler);
+            server.AddHTTPHandler("/object/", new ObjectHandler(m_LocalSimulationService).Handler);
            //server.AddStreamHandler(new ObjectPostHandler(m_SimulationService, authentication));
-            //server.AddStreamHandler(new NeighborPostHandler(m_SimulationService, authentication));
        }
    }
 }
diff --git a/OpenSim/Server/Handlers/Simulation/Utils.cs b/OpenSim/Server/Handlers/Simulation/Utils.cs
new file mode 100644
index 0000000..1f2f851
--- /dev/null
+++ b/OpenSim/Server/Handlers/Simulation/Utils.cs
@@ -0,0 +1,103 @@
+/*
+ * 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 OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using log4net;
+namespace OpenSim.Server.Handlers.Simulation
+{
+    public class Utils
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        /// <summary>
+        /// Extract the param from an uri.
+        /// </summary>
+        /// <param name="uri">Something like this: /agent/uuid/ or /agent/uuid/handle/release</param>
+        /// <param name="uri">uuid on uuid field</param>
+        /// <param name="action">optional action</param>
+        public static bool GetParams(string uri, out UUID uuid, out ulong regionHandle, out string action)
+        {
+            uuid = UUID.Zero;
+            action = "";
+            regionHandle = 0;
+            uri = uri.Trim(new char[] { '/' });
+            string[] parts = uri.Split('/');
+            if (parts.Length <= 1)
+            {
+                return false;
+            }
+            else
+            {
+                if (!UUID.TryParse(parts[1], out uuid))
+                    return false;
+                if (parts.Length >= 3)
+                    UInt64.TryParse(parts[2], out regionHandle);
+                if (parts.Length >= 4)
+                    action = parts[3];
+                return true;
+            }
+        }
+        public static OSDMap GetOSDMap(string data)
+        {
+            OSDMap args = null;
+            try
+            {
+                OSD buffer;
+                // We should pay attention to the content-type, but let's assume we know it's Json
+                buffer = OSDParser.DeserializeJson(data);
+                if (buffer.Type == OSDType.Map)
+                {
+                    args = (OSDMap)buffer;
+                    return args;
+                }
+                else
+                {
+                    // uh?
+                    m_log.Debug(("[REST COMMS]: Got OSD of unexpected type " + buffer.Type.ToString()));
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Debug("[REST COMMS]: exception on parse of REST message " + ex.Message);
+                return null;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
index e8b9fc3..f17a8de 100644
--- a/OpenSim/Services/UserService/UserService.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
@@ -26,51 +26,36 @@
 */
 using System;
-using System.Reflection;
 using Nini.Config;
-using OpenSim.Data;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
-using System.Collections.Generic;
+using OpenSim.Framework.Servers.HttpServer;
-using OpenMetaverse;
+using OpenSim.Server.Handlers.Base;
-namespace OpenSim.Services.UserAccountService
+namespace OpenSim.Server.Handlers.UserAccounts
 {
-    public class UserAccountService : UserAccountServiceBase, IUserAccountService
+    public class UserAccountServiceConnector : ServiceConnector
    {
-        public UserAccountService(IConfigSource config) : base(config)
+        private IUserAccountService m_UserAccountService;
-        {
+        private string m_ConfigName = "UserAccountService";
-        }
-        public UserAccount GetUserAccount(UUID scopeID, string firstName,
+        public UserAccountServiceConnector(IConfigSource config, IHttpServer server, string configName) :
-                string lastName)
+                base(config, server, configName)
        {
-            return null;
+            IConfig serverConfig = config.Configs[m_ConfigName];
-        }
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+            string service = serverConfig.GetString("LocalServiceModule",
-        {
+                    String.Empty);
-            return null;
-        }
-        public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret)
+            if (service == String.Empty)
-        {
+                throw new Exception("No LocalServiceModule in config file");
-            return false;
-        }
-        public bool SetUserAccount(UserAccount data, UUID principalID, string token)
+            Object[] args = new Object[] { config };
-        {
+            m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(service, args);
-            return false;
-        }
-        public bool CreateUserAccount(UserAccount data, UUID principalID, string token)
-        {
-            return false;
-        }
-        public List<UserAccount> GetUserAccount(UUID scopeID,
+            server.AddStreamHandler(new UserAccountServerPostHandler(m_UserAccountService));
-                string query)
-        {
-            return null;
        }
    }
 }
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
new file mode 100644
index 0000000..544ffea
--- /dev/null
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -0,0 +1,257 @@
+/*
+ * 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 Nini.Config;
+using log4net;
+using System;
+using System.Reflection;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Serialization;
+using System.Collections.Generic;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+namespace OpenSim.Server.Handlers.UserAccounts
+{
+    public class UserAccountServerPostHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IUserAccountService m_UserAccountService;
+        public UserAccountServerPostHandler(IUserAccountService service) :
+                base("POST", "/accounts")
+        {
+            m_UserAccountService = service;
+        }
+        public override byte[] Handle(string path, Stream requestData,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            StreamReader sr = new StreamReader(requestData);
+            string body = sr.ReadToEnd();
+            sr.Close();
+            body = body.Trim();
+            // We need to check the authorization header
+            //httpRequest.Headers["authorization"] ...
+            //m_log.DebugFormat("[XXX]: query String: {0}", body);
+            try
+            {
+                Dictionary<string, object> request =
+                        ServerUtils.ParseQueryString(body);
+                if (!request.ContainsKey("METHOD"))
+                    return FailureResult();
+                string method = request["METHOD"].ToString();
+                switch (method)
+                {
+                    case "getaccount":
+                        return GetAccount(request);
+                    case "getaccounts":
+                        return GetAccounts(request);
+                    case "setaccount":
+                        return StoreAccount(request);
+                }
+                m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method);
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[PRESENCE HANDLER]: Exception {0}" + e);
+            }
+            return FailureResult();
+        }
+        byte[] GetAccount(Dictionary<string, object> request)
+        {
+            UserAccount account = null;
+            UUID scopeID = UUID.Zero;
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if (!request.ContainsKey("ScopeID"))
+            {
+                result["result"] = "null";
+                return ResultToBytes(result);
+            }
+            if (!UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
+            {
+                result["result"] = "null";
+                return ResultToBytes(result);
+            }
+            if (request.ContainsKey("UserID") && request["UserID"] != null)
+            {
+                UUID userID;
+                if (UUID.TryParse(request["UserID"].ToString(), out userID))
+                    account = m_UserAccountService.GetUserAccount(scopeID, userID);
+            }
+            else if (request.ContainsKey("Email") && request["Email"] != null)
+                account = m_UserAccountService.GetUserAccount(scopeID, request["Email"].ToString());
+            else if (request.ContainsKey("FirstName") && request.ContainsKey("LastName") &&
+                request["FirstName"] != null && request["LastName"] != null)
+                account = m_UserAccountService.GetUserAccount(scopeID, request["FirstName"].ToString(), request["LastName"].ToString());
+            if (account == null)
+                result["result"] = "null";
+            else
+                result["result"] = account.ToKeyValuePairs();
+            return ResultToBytes(result);
+        }
+        byte[] GetAccounts(Dictionary<string, object> request)
+        {
+            if (!request.ContainsKey("ScopeID") || !request.ContainsKey("query"))
+                return FailureResult();
+            UUID scopeID = UUID.Zero;
+            if (!UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
+                return FailureResult();
+            string query = request["query"].ToString();
+            List<UserAccount> accounts = m_UserAccountService.GetUserAccounts(scopeID, query);
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((accounts == null) || ((accounts != null) && (accounts.Count == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (UserAccount acc in accounts)
+                {
+                    Dictionary<string, object> rinfoDict = acc.ToKeyValuePairs();
+                    result["account" + i] = rinfoDict;
+                    i++;
+                }
+            }
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+        byte[] StoreAccount(Dictionary<string, object> request)
+        {
+            if (!request.ContainsKey("account"))
+                return FailureResult();
+            if (request["account"] == null)
+                return FailureResult();
+            if (!(request["account"] is Dictionary<string, object>))
+                return FailureResult();
+            UserAccount account = new UserAccount((Dictionary<string, object>)request["account"]);
+            if (m_UserAccountService.StoreUserAccount(account))
+                return SuccessResult();
+            return FailureResult();
+        }
+        private byte[] SuccessResult()
+        {
+            XmlDocument doc = new XmlDocument();
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+            doc.AppendChild(xmlnode);
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+            doc.AppendChild(rootElement);
+            XmlElement result = doc.CreateElement("", "result", "");
+            result.AppendChild(doc.CreateTextNode("Success"));
+            rootElement.AppendChild(result);
+            return DocToBytes(doc);
+        }
+        private byte[] FailureResult()
+        {
+            XmlDocument doc = new XmlDocument();
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+            doc.AppendChild(xmlnode);
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+            doc.AppendChild(rootElement);
+            XmlElement result = doc.CreateElement("", "result", "");
+            result.AppendChild(doc.CreateTextNode("Failure"));
+            rootElement.AppendChild(result);
+            return DocToBytes(doc);
+        }
+        private byte[] DocToBytes(XmlDocument doc)
+        {
+            MemoryStream ms = new MemoryStream();
+            XmlTextWriter xw = new XmlTextWriter(ms, null);
+            xw.Formatting = Formatting.Indented;
+            doc.WriteTo(xw);
+            xw.Flush();
+            return ms.ToArray();
+        }
+        private byte[] ResultToBytes(Dictionary<string, object> result)
+        {
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
index 50e817e..19bb3e2 100644
--- a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Connectors
        public string Authenticate(UUID principalID, string password, int lifetime)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["LIFETIME"] = lifetime.ToString();
            sendData["PRINCIPAL"] = principalID.ToString();
            sendData["PASSWORD"] = password;
@@ -106,7 +106,7 @@ namespace OpenSim.Services.Connectors
        public bool Verify(UUID principalID, string token, int lifetime)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["LIFETIME"] = lifetime.ToString();
            sendData["PRINCIPAL"] = principalID.ToString();
            sendData["TOKEN"] = token;
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Connectors
        public bool Release(UUID principalID, string token)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["PRINCIPAL"] = principalID.ToString();
            sendData["TOKEN"] = token;
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index 02f2b79..99aa3fb 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Connectors
        public virtual bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
        {
            Dictionary<string, object> rinfo = regionInfo.ToKeyValuePairs();
-            Dictionary<string, string> sendData = new Dictionary<string,string>();
+            Dictionary<string, object> sendData = new Dictionary<string,object>();
            foreach (KeyValuePair<string, object> kvp in rinfo)
                sendData[kvp.Key] = (string)kvp.Value;
@@ -130,7 +130,7 @@ namespace OpenSim.Services.Connectors
        public virtual bool DeregisterRegion(UUID regionID)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["REGIONID"] = regionID.ToString();
@@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors
        public virtual List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["SCOPEID"] = scopeID.ToString();
            sendData["REGIONID"] = regionID.ToString();
@@ -212,7 +212,7 @@ namespace OpenSim.Services.Connectors
        public virtual GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["SCOPEID"] = scopeID.ToString();
            sendData["REGIONID"] = regionID.ToString();
@@ -258,7 +258,7 @@ namespace OpenSim.Services.Connectors
        public virtual GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["SCOPEID"] = scopeID.ToString();
            sendData["X"] = x.ToString();
@@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors
        public virtual GridRegion GetRegionByName(UUID scopeID, string regionName)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["SCOPEID"] = scopeID.ToString();
            sendData["NAME"] = regionName;
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors
        public virtual List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["SCOPEID"] = scopeID.ToString();
            sendData["NAME"] = name;
@@ -396,7 +396,7 @@ namespace OpenSim.Services.Connectors
        public virtual List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
        {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["SCOPEID"] = scopeID.ToString();
            sendData["XMIN"] = xmin.ToString();
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
new file mode 100644
index 0000000..29cfd6e
--- /dev/null
+++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
@@ -0,0 +1,421 @@
+/*
+ * 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.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+namespace OpenSim.Services.Connectors
+{
+    public class PresenceServicesConnector : IPresenceService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        private string m_ServerURI = String.Empty;
+        public PresenceServicesConnector()
+        {
+        }
+        public PresenceServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+        public PresenceServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["PresenceService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
+                throw new Exception("Presence connector init error");
+            }
+            string serviceURI = gridConfig.GetString("PresenceServerURI",
+                    String.Empty);
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[PRESENCE CONNECTOR]: No Server URI named in section PresenceService");
+                throw new Exception("Presence connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+        #region IPresenceService
+        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "login";
+            sendData["UserID"] = userID;
+            sendData["SessionID"] = sessionID.ToString();
+            sendData["SecureSessionID"] = secureSessionID.ToString();
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                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("[PRESENCE CONNECTOR]: LoginAgent reply data does not contain result field");
+                }
+                else
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: LoginAgent received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+            return false;
+        }
+        public bool LogoutAgent(UUID sessionID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "logout";
+            sendData["SessionID"] = sessionID.ToString();
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                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("[PRESENCE CONNECTOR]: LogoutAgent reply data does not contain result field");
+                }
+                else
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: LogoutAgent received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+            return false;
+        }
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "logoutregion";
+            sendData["RegionID"] = regionID.ToString();
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                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("[PRESENCE CONNECTOR]: LogoutRegionAgents reply data does not contain result field");
+                }
+                else
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: LogoutRegionAgents received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+            return false;
+        }
+        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "report";
+            sendData["SessionID"] = sessionID.ToString();
+            sendData["RegionID"] = regionID.ToString();
+            sendData["position"] = position.ToString();
+            sendData["lookAt"] = lookAt.ToString();
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                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("[PRESENCE CONNECTOR]: ReportAgent reply data does not contain result field");
+                }
+                else
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: ReportAgent received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+            return false;
+        }
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "getagent";
+            sendData["SessionID"] = sessionID.ToString();
+            string reply = string.Empty;
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                if (reply == null || (reply != null && reply == string.Empty))
+                {
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgent received null or empty reply");
+                    return null;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+            PresenceInfo pinfo = null;
+            if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
+            {
+                if (replyData["result"] is Dictionary<string, object>)
+                {
+                    pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]);
+                }
+            }
+            return pinfo;
+        }
+        public PresenceInfo[] GetAgents(string[] userIDs)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "getagents";
+            sendData["uuids"] = new List<string>(userIDs);
+            string reply = string.Empty;
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                if (reply == null || (reply != null && reply == string.Empty))
+                {
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgent received null or empty reply");
+                    return null;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+            List<PresenceInfo> rinfos = new List<PresenceInfo>();
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+            if (replyData != null)
+            {
+                if (replyData.ContainsKey("result") && 
+                    (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure"))
+                {
+                    return new PresenceInfo[0];
+                }
+                Dictionary<string, object>.ValueCollection pinfosList = replyData.Values;
+                //m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgents returned {0} elements", pinfosList.Count);
+                foreach (object presence in pinfosList)
+                {
+                    if (presence is Dictionary<string, object>)
+                    {
+                        PresenceInfo pinfo = new PresenceInfo((Dictionary<string, object>)presence);
+                        rinfos.Add(pinfo);
+                    }
+                    else
+                        m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgents received invalid response type {0}",
+                            presence.GetType());
+                }
+            }
+            else
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgents received null response");
+            return rinfos.ToArray();
+        }
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "sethome";
+            sendData["UserID"] = userID;
+            sendData["RegionID"] = regionID.ToString();
+            sendData["position"] = position.ToString();
+            sendData["lookAt"] = lookAt.ToString();
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                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("[PRESENCE CONNECTOR]: SetHomeLocation reply data does not contain result field");
+                }
+                else
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: SetHomeLocation received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+            return false;
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
new file mode 100644
index 0000000..6f71197
--- /dev/null
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -0,0 +1,242 @@
+/*
+ * 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.IO;
+using System.Net;
+using System.Reflection;
+using System.Text;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using log4net;
+namespace OpenSim.Services.Connectors.Simulation
+{
+    public class SimulationServiceConnector : ISimulationService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private GridRegion m_Region;
+        public SimulationServiceConnector()
+        {
+        }
+        public SimulationServiceConnector(GridRegion region)
+        {
+            m_Region = region;
+        }
+        public IScene GetScene(ulong regionHandle)
+        {
+            return null;
+        }
+        #region Agents
+        public bool CreateAgent(ulong regionHandle, AgentCircuitData aCircuit, uint flags, out string reason)
+        {
+            reason = String.Empty;
+            // Eventually, we want to use a caps url instead of the agentID
+            string uri = string.Empty;
+            try
+            {
+                uri = "http://" + m_Region.ExternalEndPoint.Address + ":" + m_Region.HttpPort + "/agent/" + aCircuit.AgentID + "/";
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[REST COMMS]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
+                reason = e.Message;
+                return false;
+            }
+            //Console.WriteLine("   >>> DoCreateChildAgentCall <<< " + uri);
+            HttpWebRequest AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri);
+            AgentCreateRequest.Method = "POST";
+            AgentCreateRequest.ContentType = "application/json";
+            AgentCreateRequest.Timeout = 10000;
+            //AgentCreateRequest.KeepAlive = false;
+            //AgentCreateRequest.Headers.Add("Authorization", authKey);
+            // Fill it in
+            OSDMap args = null;
+            try
+            {
+                args = aCircuit.PackAgentCircuitData();
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[REST COMMS]: PackAgentCircuitData failed with exception: " + e.Message);
+            }
+            // Add the regionhandle and the name of the destination region
+            args["destination_handle"] = OSD.FromString(m_Region.RegionHandle.ToString());
+            args["destination_name"] = OSD.FromString(m_Region.RegionName);
+            args["teleport_flags"] = OSD.FromString(flags.ToString());
+            string strBuffer = "";
+            byte[] buffer = new byte[1];
+            try
+            {
+                strBuffer = OSDParser.SerializeJsonString(args);
+                Encoding str = Util.UTF8;
+                buffer = str.GetBytes(strBuffer);
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of ChildCreate: {0}", e.Message);
+                // ignore. buffer will be empty, caller should check.
+            }
+            Stream os = null;
+            try
+            { // send the Post
+                AgentCreateRequest.ContentLength = buffer.Length;   //Count bytes to send
+                os = AgentCreateRequest.GetRequestStream();
+                os.Write(buffer, 0, strBuffer.Length);         //Send it
+                //m_log.InfoFormat("[REST COMMS]: Posted CreateChildAgent request to remote sim {0}", uri);
+            }
+            //catch (WebException ex)
+            catch
+            {
+                //m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message);
+                reason = "cannot contact remote region";
+                return false;
+            }
+            finally
+            {
+                if (os != null)
+                    os.Close();
+            }
+            // Let's wait for the response
+            //m_log.Info("[REST COMMS]: Waiting for a reply after DoCreateChildAgentCall");
+            WebResponse webResponse = null;
+            StreamReader sr = null;
+            try
+            {
+                webResponse = AgentCreateRequest.GetResponse();
+                if (webResponse == null)
+                {
+                    m_log.Info("[REST COMMS]: Null reply on DoCreateChildAgentCall post");
+                }
+                else
+                {
+                    sr = new StreamReader(webResponse.GetResponseStream());
+                    string response = sr.ReadToEnd().Trim();
+                    m_log.InfoFormat("[REST COMMS]: DoCreateChildAgentCall reply was {0} ", response);
+                    if (!String.IsNullOrEmpty(response))
+                    {
+                        try
+                        {
+                            // we assume we got an OSDMap back
+                            OSDMap r = Util.GetOSDMap(response);
+                            bool success = r["success"].AsBoolean();
+                            reason = r["reason"].AsString();
+                            return success;
+                        }
+                        catch (NullReferenceException e)
+                        {
+                            m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateChildAgentCall {0}", e.Message);
+                            // check for old style response
+                            if (response.ToLower().StartsWith("true"))
+                                return true;
+                            return false;
+                        }
+                    }
+                }
+            }
+            catch (WebException ex)
+            {
+                m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateChildAgentCall {0}", ex.Message);
+                // ignore, really
+            }
+            finally
+            {
+                if (sr != null)
+                    sr.Close();
+            }
+            return true;
+        }
+        public bool UpdateAgent(ulong regionHandle, AgentData data)
+        {
+            return false;
+        }
+        public bool UpdateAgent(ulong regionHandle, AgentPosition data)
+        {
+            return false;
+        }
+        public bool RetrieveAgent(ulong regionHandle, UUID id, out IAgentData agent)
+        {
+            agent = null;
+            return false;
+        }
+        public bool ReleaseAgent(ulong regionHandle, UUID id, string uri)
+        {
+            return false;
+        }
+        public bool CloseAgent(ulong regionHandle, UUID id)
+        {
+            return false;
+        }
+        #endregion Agents
+        #region Objects
+        public bool CreateObject(ulong regionHandle, ISceneObject sog, bool isLocalCall)
+        {
+            return false;
+        }
+        public bool CreateObject(ulong regionHandle, UUID userID, UUID itemID)
+        {
+            return false;
+        }
+        #endregion Objects
+    }
+}
diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
deleted file mode 100644
index 683990f..0000000
--- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.Communications;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Services.Interfaces;
-using OpenMetaverse;
-namespace OpenSim.Services.Connectors
-{
-    public class UserServicesConnector : IUserAccountService
-    {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-//        private string m_ServerURI = String.Empty;
-        public UserServicesConnector()
-        {
-        }
-        public UserServicesConnector(string serverURI)
-        {
-//            m_ServerURI = serverURI.TrimEnd('/');
-        }
-        public UserServicesConnector(IConfigSource source)
-        {
-            Initialise(source);
-        }
-        public virtual void Initialise(IConfigSource source)
-        {
-            IConfig assetConfig = source.Configs["UserService"];
-            if (assetConfig == null)
-            {
-                m_log.Error("[USER CONNECTOR]: UserService missing from OpanSim.ini");
-                throw new Exception("User connector init error");
-            }
-            string serviceURI = assetConfig.GetString("UserServerURI",
-                    String.Empty);
-            if (serviceURI == String.Empty)
-            {
-                m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService");
-                throw new Exception("User connector init error");
-            }
-            //m_ServerURI = serviceURI;
-        }
-        public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
-        {
-            return null;
-        }
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
-        {
-            return null;
-        }
-        public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret)
-        {
-            return false;
-        }
-        public bool SetUserAccount(UserAccount data, UUID principalID, string token)
-        {
-            return false;
-        }
-        public bool CreateUserAccount(UserAccount data, UUID principalID, string token)
-        {
-            return false;
-        }
-        public List<UserAccount> GetUserAccount(UUID scopeID, string query)
-        {
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
new file mode 100644
index 0000000..46313d9
--- /dev/null
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
@@ -0,0 +1,274 @@
+/*
+ * 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.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+namespace OpenSim.Services.Connectors
+{
+    public class UserAccountServicesConnector : IUserAccountService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        private string m_ServerURI = String.Empty;
+        public UserAccountServicesConnector()
+        {
+        }
+        public UserAccountServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+        public UserAccountServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig assetConfig = source.Configs["UserAccountService"];
+            if (assetConfig == null)
+            {
+                m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
+                throw new Exception("User account connector init error");
+            }
+            string serviceURI = assetConfig.GetString("UserAccountServerURI",
+                    String.Empty);
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[ACCOUNT CONNECTOR]: No Server URI named in section UserAccountService");
+                throw new Exception("User account connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+        public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "getaccount";
+            sendData["ScopeID"] = scopeID;
+            sendData["FirstName"] = firstName.ToString();
+            sendData["LastName"] = lastName.ToString();
+            return SendAndGetReply(sendData);
+        }
+        public UserAccount GetUserAccount(UUID scopeID, string email)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "getaccount";
+            sendData["ScopeID"] = scopeID;
+            sendData["Email"] = email;
+            return SendAndGetReply(sendData);
+        }
+        
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "getaccount";
+            sendData["ScopeID"] = scopeID;
+            sendData["UserID"] = userID.ToString();
+            return SendAndGetReply(sendData);
+        }
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "getagents";
+            sendData["ScopeID"] = scopeID.ToString();
+            sendData["query"] = query;
+            string reply = string.Empty;
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/accounts",
+                        reqString);
+                if (reply == null || (reply != null && reply == string.Empty))
+                {
+                    m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received null or empty reply");
+                    return null;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting accounts server: {0}", e.Message);
+            }
+            List<UserAccount> accounts = new List<UserAccount>();
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+            if (replyData != null)
+            {
+                if (replyData.ContainsKey("result") && replyData.ContainsKey("result").ToString() == "null")
+                {
+                    return accounts;
+                }
+                Dictionary<string, object>.ValueCollection accountList = replyData.Values;
+                //m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetAgents returned {0} elements", pinfosList.Count);
+                foreach (object acc in accountList)
+                {
+                    if (acc is Dictionary<string, object>)
+                    {
+                        UserAccount pinfo = new UserAccount((Dictionary<string, object>)acc);
+                        accounts.Add(pinfo);
+                    }
+                    else
+                        m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received invalid response type {0}",
+                            acc.GetType());
+                }
+            }
+            else
+                m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccounts received null response");
+            return accounts;
+        }
+        public bool StoreUserAccount(UserAccount data)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "setaccount";
+            sendData["account"] = data.ToKeyValuePairs();
+            return SendAndGetBoolReply(sendData);
+        }
+        private UserAccount SendAndGetReply(Dictionary<string, object> sendData)
+        {
+            string reply = string.Empty;
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/accounts",
+                        reqString);
+                if (reply == null || (reply != null && reply == string.Empty))
+                {
+                    m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccount received null or empty reply");
+                    return null;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user account server: {0}", e.Message);
+            }
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+            UserAccount account = null;
+            if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
+            {
+                if (replyData["result"] is Dictionary<string, object>)
+                {
+                    account = new UserAccount((Dictionary<string, object>)replyData["result"]);
+                }
+            }
+            return account;
+        }
+        private bool SendAndGetBoolReply(Dictionary<string, object> sendData)
+        {
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/accounts",
+                        reqString);
+                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("[ACCOUNTS CONNECTOR]: Set or Create UserAccount reply data does not contain result field");
+                }
+                else
+                    m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Set or Create UserAccount received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Exception when contacting user account server: {0}", e.Message);
+            }
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Services/Interfaces/ILoginService.cs b/OpenSim/Services/Interfaces/ILoginService.cs
new file mode 100644
index 0000000..0f82de5
--- /dev/null
+++ b/OpenSim/Services/Interfaces/ILoginService.cs
@@ -0,0 +1,52 @@
+/*
+ * 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 OpenMetaverse.StructuredData;
+namespace OpenSim.Services.Interfaces
+{
+    public abstract class LoginResponse
+    {
+        public abstract Hashtable ToHashtable();
+        public abstract OSD ToOSDMap();
+    }
+    public abstract class FailedLoginResponse : LoginResponse
+    {
+    }
+    public interface ILoginService
+    {
+        LoginResponse Login(string firstName, string lastName, string passwd, string startLocation);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index aa1c5bf..2dad7e6 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -25,6 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using OpenSim.Framework;
 using System.Collections.Generic;
 using OpenMetaverse;
@@ -33,13 +34,74 @@ namespace OpenSim.Services.Interfaces
 {
    public class PresenceInfo
    {
-        public UUID PrincipalID;
+        public string UserID;
        public UUID RegionID;
-        public Dictionary<string, string> Data;
+        public bool Online;
+        public DateTime Login;
+        public DateTime Logout;
+        public Vector3 Position;
+        public Vector3 LookAt;
+        public UUID HomeRegionID;
+        public Vector3 HomePosition;
+        public Vector3 HomeLookAt;
+        public PresenceInfo()
+        {
+        }
+        public PresenceInfo(Dictionary<string, object> kvp)
+        {
+            if (kvp.ContainsKey("UserID"))
+                UserID = kvp["UserID"].ToString();
+            if (kvp.ContainsKey("RegionID"))
+                UUID.TryParse(kvp["RegionID"].ToString(), out RegionID);
+            if (kvp.ContainsKey("login"))
+                DateTime.TryParse(kvp["login"].ToString(), out Login);
+            if (kvp.ContainsKey("logout"))
+                DateTime.TryParse(kvp["logout"].ToString(), out Logout);
+            if (kvp.ContainsKey("lookAt"))
+                Vector3.TryParse(kvp["lookAt"].ToString(), out LookAt);
+            if (kvp.ContainsKey("online"))
+                Boolean.TryParse(kvp["online"].ToString(), out Online);
+            if (kvp.ContainsKey("position"))
+                Vector3.TryParse(kvp["position"].ToString(), out Position);
+            if (kvp.ContainsKey("HomeRegionID"))
+                UUID.TryParse(kvp["HomeRegionID"].ToString(), out HomeRegionID);
+            if (kvp.ContainsKey("HomePosition"))
+                Vector3.TryParse(kvp["HomePosition"].ToString(), out HomePosition);
+            if (kvp.ContainsKey("HomeLookAt"))
+                Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
+        }
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["UserID"] = UserID;
+            result["RegionID"] = RegionID.ToString();
+            result["online"] = Online.ToString();
+            result["login"] = Login.ToString();
+            result["logout"] = Logout.ToString();
+            result["position"] = Position.ToString();
+            result["lookAt"] = LookAt.ToString();
+            result["HomeRegionID"] = HomeRegionID.ToString();
+            result["HomePosition"] = HomePosition.ToString();
+            result["HomeLookAt"] = HomeLookAt.ToString();
+            return result;
+        }
    }
    public interface IPresenceService
    {
-        bool Report(PresenceInfo presence);
+        bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID);
+        bool LogoutAgent(UUID sessionID);
+        bool LogoutRegionAgents(UUID regionID);
+        bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt);
+        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
+        PresenceInfo GetAgent(UUID sessionID);
+        PresenceInfo[] GetAgents(string[] userIDs);
    }
 }
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index a169ab7..7ba3e66 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -33,9 +33,11 @@ namespace OpenSim.Services.Interfaces
 {
    public interface ISimulationService
    {
+        IScene GetScene(ulong regionHandle);
        #region Agents
-        bool CreateAgent(ulong regionHandle, AgentCircuitData aCircuit, out string reason);
+        bool CreateAgent(ulong regionHandle, AgentCircuitData aCircuit, uint flags, out string reason);
        /// <summary>
        /// Full child agent update.
@@ -98,11 +100,5 @@ namespace OpenSim.Services.Interfaces
        #endregion Objects
-        #region Regions
-        bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion);
-        #endregion Regions
    }
 }
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 92bd8ef..b2d5d48 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -25,6 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections.Generic;
 using OpenMetaverse;
@@ -36,68 +37,67 @@ namespace OpenSim.Services.Interfaces
        {
        }
-        public UserAccount(UUID userID, UUID homeRegionID, float homePositionX,
+        public UserAccount(UUID principalID)
-                float homePositionY, float homePositionZ, float homeLookAtX,
-                float homeLookAtY, float homeLookAtZ)
        {
-            UserID = userID;
+            PrincipalID = principalID;
-            HomeRegionID = homeRegionID;
-            HomePositionX = homePositionX;
-            HomePositionY = homePositionY;
-            HomePositionZ = homePositionZ;
-            HomeLookAtX = homeLookAtX;
-            HomeLookAtY = homeLookAtY;
-            HomeLookAtZ = homeLookAtZ;
        }
        public string FirstName;
        public string LastName;
-        public UUID UserID;
+        public string Email;
+        public UUID PrincipalID;
        public UUID ScopeID;
-        // For informational purposes only!
+        public Dictionary<string, object> ServiceURLs;
-        //
-        public string HomeRegionName;
-        public UUID HomeRegionID;
+        public int Created;
-        public float HomePositionX;
-        public float HomePositionY;
-        public float HomePositionZ;
-        public float HomeLookAtX;
-        public float HomeLookAtY;
-        public float HomeLookAtZ;
-        // These are here because they
+        public UserAccount(Dictionary<string, object> kvp)
-        // concern the account rather than
+        {
-        // the profile. They just happen to
+            if (kvp.ContainsKey("FirstName"))
-        // be used in the Linden profile as well
+                FirstName = kvp["FirstName"].ToString();
-        //
+            if (kvp.ContainsKey("LastName"))
-        public int GodLevel;
+                LastName = kvp["LastName"].ToString();
-        public int UserFlags;
+            if (kvp.ContainsKey("Email"))
-        public string AccountType;
+                Email = kvp["Email"].ToString();
+            if (kvp.ContainsKey("PrincipalID"))
+                UUID.TryParse(kvp["PrincipalID"].ToString(), out PrincipalID);
+            if (kvp.ContainsKey("ScopeID"))
+                UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID);
+            if (kvp.ContainsKey("Created"))
+                Convert.ToInt32(kvp["Created"].ToString());
+            if (kvp.ContainsKey("ServiceURLs") && kvp["ServiceURLs"] != null && (kvp["ServiceURLs"] is Dictionary<string, string>))
+                ServiceURLs = (Dictionary<string, object>)kvp["ServiceURLs"];
+        }
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["FirstName"] = FirstName;
+            result["LastName"] = LastName;
+            result["Email"] = Email;
+            result["PrincipalID"] = PrincipalID.ToString();
+            result["ScopeID"] = ScopeID.ToString();
+            result["Created"] = Created.ToString();
+            result["ServiceURLs"] = ServiceURLs;
+            return result;
+        }
    };
    public interface IUserAccountService
    {
        UserAccount GetUserAccount(UUID scopeID, UUID userID);
        UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
+        UserAccount GetUserAccount(UUID scopeID, string Email);
        // Returns the list of avatars that matches both the search
        // criterion and the scope ID passed
        //
-        List<UserAccount> GetUserAccount(UUID scopeID, string query);
+        List<UserAccount> GetUserAccounts(UUID scopeID, string query);
-        // This will set only the home region portion of the data!
-        // Can't be used to set god level, flags, type or change the name!
-        //
-        bool SetHomePosition(UserAccount data, UUID RegionID, UUID RegionSecret);
-        // Update all updatable fields
+        // Store the data given, wich replaces the sotred data, therefore
+        // must be complete.
        //
-        bool SetUserAccount(UserAccount data, UUID PrincipalID, string token);
+        bool StoreUserAccount(UserAccount data);
-        
-        // Creates a user data record
-        bool CreateUserAccount(UserAccount data, UUID PrincipalID, string token);
    }
 }
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
new file mode 100644
index 0000000..fbce63f
--- /dev/null
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -0,0 +1,740 @@
+/*
+ * 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.Reflection;
+using OpenSim.Framework;
+using log4net;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+namespace OpenSim.Services.LLLoginService
+{
+    public class LLFailedLoginResponse : OpenSim.Services.Interfaces.FailedLoginResponse
+    {
+        string m_key;
+        string m_value;
+        string m_login;
+        public static LLFailedLoginResponse UserProblem;
+        public static LLFailedLoginResponse GridProblem;
+        public static LLFailedLoginResponse InventoryProblem;
+        public static LLFailedLoginResponse DeadRegionProblem;
+        public static LLFailedLoginResponse LoginBlockedProblem;
+        public static LLFailedLoginResponse AlreadyLoggedInProblem;
+        public static LLFailedLoginResponse InternalError;
+        static LLFailedLoginResponse()
+        {
+            UserProblem = new LLFailedLoginResponse("key", 
+                "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
+                "false");
+            GridProblem = new LLFailedLoginResponse("key",
+                "Error connecting to grid. Could not percieve credentials from login XML.",
+                "false");
+            InventoryProblem = new LLFailedLoginResponse("key",
+                "The inventory service is not responding.  Please notify your login region operator.",
+                "false");
+            DeadRegionProblem = new LLFailedLoginResponse("key",
+                "The region you are attempting to log into is not responding. Please select another region and try again.",
+                "false");
+            LoginBlockedProblem = new LLFailedLoginResponse("presence",
+                "Logins are currently restricted. Please try again later.",
+                "false");
+            AlreadyLoggedInProblem = new LLFailedLoginResponse("presence",
+                "You appear to be already logged in. " +
+                "If this is not the case please wait for your session to timeout. " +
+                "If this takes longer than a few minutes please contact the grid owner. " +
+                "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.",
+                "false");
+            InternalError = new LLFailedLoginResponse("Internal Error", "Error generating Login Response", "false");
+        }
+        public LLFailedLoginResponse(string key, string value, string login)
+        {
+            m_key = key;
+            m_value = value;
+            m_login = login;
+        }
+        public override Hashtable ToHashtable()
+        {
+            Hashtable loginError = new Hashtable();
+            loginError["reason"] = m_key;
+            loginError["message"] = m_value;
+            loginError["login"] = m_login;
+            return loginError;
+        }
+        public override OSD ToOSDMap()
+        {
+            OSDMap map = new OSDMap();
+            map["reason"] = OSD.FromString(m_key);
+            map["message"] = OSD.FromString(m_value);
+            map["login"] = OSD.FromString(m_login);
+            return map;
+        }
+    }
+    /// <summary>
+    /// A class to handle LL login response.
+    /// </summary>
+    public class LLLoginResponse : OpenSim.Services.Interfaces.LoginResponse
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static Hashtable globalTexturesHash;
+        // Global Textures
+        private static string sunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";
+        private static string cloudTexture = "dc4b9f0b-d008-45c6-96a4-01dd947ac621";
+        private static string moonTexture = "ec4b9f0b-d008-45c6-96a4-01dd947ac621";
+        private Hashtable loginFlagsHash;
+        private Hashtable uiConfigHash;
+        private ArrayList loginFlags;
+        private ArrayList globalTextures;
+        private ArrayList eventCategories;
+        private ArrayList uiConfig;
+        private ArrayList classifiedCategories;
+        private ArrayList inventoryRoot;
+        private ArrayList initialOutfit;
+        private ArrayList agentInventory;
+        private ArrayList inventoryLibraryOwner;
+        private ArrayList inventoryLibRoot;
+        private ArrayList inventoryLibrary;
+        private ArrayList activeGestures;
+        private UserInfo userProfile;
+        private UUID agentID;
+        private UUID sessionID;
+        private UUID secureSessionID;
+        // Login Flags
+        private string dst;
+        private string stipendSinceLogin;
+        private string gendered;
+        private string everLoggedIn;
+        private string login;
+        private uint simPort;
+        private uint simHttpPort;
+        private string simAddress;
+        private string agentAccess;
+        private string agentAccessMax;
+        private Int32 circuitCode;
+        private uint regionX;
+        private uint regionY;
+        // Login
+        private string firstname;
+        private string lastname;
+        // Error Flags
+        private string errorReason;
+        private string errorMessage;
+        private string welcomeMessage;
+        private string startLocation;
+        private string allowFirstLife;
+        private string home;
+        private string seedCapability;
+        private string lookAt;
+        private BuddyList m_buddyList = null;
+        static LLLoginResponse()
+        {
+            // This is being set, but it's not used
+            // not sure why.
+            globalTexturesHash = new Hashtable();
+            globalTexturesHash["sun_texture_id"] = sunTexture;
+            globalTexturesHash["cloud_texture_id"] = cloudTexture;
+            globalTexturesHash["moon_texture_id"] = moonTexture;
+        }
+        public LLLoginResponse()
+        {
+            loginFlags = new ArrayList();
+            globalTextures = new ArrayList();
+            eventCategories = new ArrayList();
+            uiConfig = new ArrayList();
+            classifiedCategories = new ArrayList();
+            uiConfigHash = new Hashtable();
+            // defaultXmlRpcResponse = new XmlRpcResponse();
+            userProfile = new UserInfo();
+            inventoryRoot = new ArrayList();
+            initialOutfit = new ArrayList();
+            agentInventory = new ArrayList();
+            inventoryLibrary = new ArrayList();
+            inventoryLibraryOwner = new ArrayList();
+            activeGestures = new ArrayList();
+            SetDefaultValues();
+        }
+        private void SetDefaultValues()
+        {
+            DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            StipendSinceLogin = "N";
+            Gendered = "Y";
+            EverLoggedIn = "Y";
+            login = "false";
+            firstname = "Test";
+            lastname = "User";
+            agentAccess = "M";
+            agentAccessMax = "A";
+            startLocation = "last";
+            allowFirstLife = "Y";
+            ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";
+            ErrorReason = "key";
+            welcomeMessage = "Welcome to OpenSim!";
+            seedCapability = String.Empty;
+            home = "{'region_handle':[r" + (1000*Constants.RegionSize).ToString() + ",r" + (1000*Constants.RegionSize).ToString() + "], 'position':[r" +
+                   userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
+                   userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +
+                   userProfile.homelookat.Y.ToString() + ",r" + userProfile.homelookat.Z.ToString() + "]}";
+            lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
+            RegionX = (uint) 255232;
+            RegionY = (uint) 254976;
+            // Classifieds;
+            AddClassifiedCategory((Int32) 1, "Shopping");
+            AddClassifiedCategory((Int32) 2, "Land Rental");
+            AddClassifiedCategory((Int32) 3, "Property Rental");
+            AddClassifiedCategory((Int32) 4, "Special Attraction");
+            AddClassifiedCategory((Int32) 5, "New Products");
+            AddClassifiedCategory((Int32) 6, "Employment");
+            AddClassifiedCategory((Int32) 7, "Wanted");
+            AddClassifiedCategory((Int32) 8, "Service");
+            AddClassifiedCategory((Int32) 9, "Personal");
+            SessionID = UUID.Random();
+            SecureSessionID = UUID.Random();
+            AgentID = UUID.Random();
+            Hashtable InitialOutfitHash = new Hashtable();
+            InitialOutfitHash["folder_name"] = "Nightclub Female";
+            InitialOutfitHash["gender"] = "female";
+            initialOutfit.Add(InitialOutfitHash);
+        }
+        public override Hashtable ToHashtable()
+        {
+            try
+            {
+                Hashtable responseData = new Hashtable();
+                loginFlagsHash = new Hashtable();
+                loginFlagsHash["daylight_savings"] = DST;
+                loginFlagsHash["stipend_since_login"] = StipendSinceLogin;
+                loginFlagsHash["gendered"] = Gendered;
+                loginFlagsHash["ever_logged_in"] = EverLoggedIn;
+                loginFlags.Add(loginFlagsHash);
+                responseData["first_name"] = Firstname;
+                responseData["last_name"] = Lastname;
+                responseData["agent_access"] = agentAccess;
+                responseData["agent_access_max"] = agentAccessMax;
+                globalTextures.Add(globalTexturesHash);
+                // this.eventCategories.Add(this.eventCategoriesHash);
+                AddToUIConfig("allow_first_life", allowFirstLife);
+                uiConfig.Add(uiConfigHash);
+                responseData["sim_port"] = (Int32) SimPort;
+                responseData["sim_ip"] = SimAddress;
+                responseData["http_port"] = (Int32)SimHttpPort;
+                responseData["agent_id"] = AgentID.ToString();
+                responseData["session_id"] = SessionID.ToString();
+                responseData["secure_session_id"] = SecureSessionID.ToString();
+                responseData["circuit_code"] = CircuitCode;
+                responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+                responseData["login-flags"] = loginFlags;
+                responseData["global-textures"] = globalTextures;
+                responseData["seed_capability"] = seedCapability;
+                responseData["event_categories"] = eventCategories;
+                responseData["event_notifications"] = new ArrayList(); // todo
+                responseData["classified_categories"] = classifiedCategories;
+                responseData["ui-config"] = uiConfig;
+                if (agentInventory != null)
+                {
+                    responseData["inventory-skeleton"] = agentInventory;
+                    responseData["inventory-root"] = inventoryRoot;
+                }
+                responseData["inventory-skel-lib"] = inventoryLibrary;
+                responseData["inventory-lib-root"] = inventoryLibRoot;
+                responseData["gestures"] = activeGestures;
+                responseData["inventory-lib-owner"] = inventoryLibraryOwner;
+                responseData["initial-outfit"] = initialOutfit;
+                responseData["start_location"] = startLocation;
+                responseData["seed_capability"] = seedCapability;
+                responseData["home"] = home;
+                responseData["look_at"] = lookAt;
+                responseData["message"] = welcomeMessage;
+                responseData["region_x"] = (Int32)(RegionX * Constants.RegionSize);
+                responseData["region_y"] = (Int32)(RegionY * Constants.RegionSize);
+                if (m_buddyList != null)
+                {
+                    responseData["buddy-list"] = m_buddyList.ToArray();
+                }
+                responseData["login"] = "true";
+                return responseData;
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[CLIENT]: LoginResponse: Error creating Hashtable Response: " + e.Message);
+                return LLFailedLoginResponse.InternalError.ToHashtable();
+            }
+        }
+        public override OSD ToOSDMap()
+        {
+            try
+            {
+                OSDMap map = new OSDMap();
+                map["first_name"] = OSD.FromString(Firstname);
+                map["last_name"] = OSD.FromString(Lastname);
+                map["agent_access"] = OSD.FromString(agentAccess);
+                map["agent_access_max"] = OSD.FromString(agentAccessMax);
+                map["sim_port"] = OSD.FromInteger(SimPort);
+                map["sim_ip"] = OSD.FromString(SimAddress);
+                map["agent_id"] = OSD.FromUUID(AgentID);
+                map["session_id"] = OSD.FromUUID(SessionID);
+                map["secure_session_id"] = OSD.FromUUID(SecureSessionID);
+                map["circuit_code"] = OSD.FromInteger(CircuitCode);
+                map["seconds_since_epoch"] = OSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
+                #region Login Flags
+                OSDMap loginFlagsLLSD = new OSDMap();
+                loginFlagsLLSD["daylight_savings"] = OSD.FromString(DST);
+                loginFlagsLLSD["stipend_since_login"] = OSD.FromString(StipendSinceLogin);
+                loginFlagsLLSD["gendered"] = OSD.FromString(Gendered);
+                loginFlagsLLSD["ever_logged_in"] = OSD.FromString(EverLoggedIn);
+                map["login-flags"] = WrapOSDMap(loginFlagsLLSD);
+                #endregion Login Flags
+                #region Global Textures
+                OSDMap globalTexturesLLSD = new OSDMap();
+                globalTexturesLLSD["sun_texture_id"] = OSD.FromString(SunTexture);
+                globalTexturesLLSD["cloud_texture_id"] = OSD.FromString(CloudTexture);
+                globalTexturesLLSD["moon_texture_id"] = OSD.FromString(MoonTexture);
+                map["global-textures"] = WrapOSDMap(globalTexturesLLSD);
+                #endregion Global Textures
+                map["seed_capability"] = OSD.FromString(seedCapability);
+                map["event_categories"] = ArrayListToOSDArray(eventCategories);
+                //map["event_notifications"] = new OSDArray(); // todo
+                map["classified_categories"] = ArrayListToOSDArray(classifiedCategories);
+                #region UI Config
+                OSDMap uiConfigLLSD = new OSDMap();
+                uiConfigLLSD["allow_first_life"] = OSD.FromString(allowFirstLife);
+                map["ui-config"] = WrapOSDMap(uiConfigLLSD);
+                #endregion UI Config
+                #region Inventory
+                map["inventory-skeleton"] = ArrayListToOSDArray(agentInventory);
+                map["inventory-skel-lib"] = ArrayListToOSDArray(inventoryLibrary);
+                map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); ;
+                map["inventory-lib-root"] = ArrayListToOSDArray(inventoryLibRoot);
+                map["inventory-lib-owner"] = ArrayListToOSDArray(inventoryLibraryOwner);
+                #endregion Inventory
+                map["gestures"] = ArrayListToOSDArray(activeGestures);
+                map["initial-outfit"] = ArrayListToOSDArray(initialOutfit);
+                map["start_location"] = OSD.FromString(startLocation);
+                map["seed_capability"] = OSD.FromString(seedCapability);
+                map["home"] = OSD.FromString(home);
+                map["look_at"] = OSD.FromString(lookAt);
+                map["message"] = OSD.FromString(welcomeMessage);
+                map["region_x"] = OSD.FromInteger(RegionX * Constants.RegionSize);
+                map["region_y"] = OSD.FromInteger(RegionY * Constants.RegionSize);
+                if (m_buddyList != null)
+                {
+                    map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
+                }
+                map["login"] = OSD.FromString("true");
+                return map;
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[CLIENT]: LoginResponse: Error creating LLSD Response: " + e.Message);
+                return LLFailedLoginResponse.InternalError.ToOSDMap();
+            }
+        }
+        public OSDArray ArrayListToOSDArray(ArrayList arrlst)
+        {
+            OSDArray llsdBack = new OSDArray();
+            foreach (Hashtable ht in arrlst)
+            {
+                OSDMap mp = new OSDMap();
+                foreach (DictionaryEntry deHt in ht)
+                {
+                    mp.Add((string)deHt.Key, OSDString.FromObject(deHt.Value));
+                }
+                llsdBack.Add(mp);
+            }
+            return llsdBack;
+        }
+        private static OSDArray WrapOSDMap(OSDMap wrapMe)
+        {
+            OSDArray array = new OSDArray();
+            array.Add(wrapMe);
+            return array;
+        }
+        public void SetEventCategories(string category, string value)
+        {
+            //  this.eventCategoriesHash[category] = value;
+            //TODO
+        }
+        public void AddToUIConfig(string itemName, string item)
+        {
+            uiConfigHash[itemName] = item;
+        }
+        public void AddClassifiedCategory(Int32 ID, string categoryName)
+        {
+            Hashtable hash = new Hashtable();
+            hash["category_name"] = categoryName;
+            hash["category_id"] = ID;
+            classifiedCategories.Add(hash);
+            // this.classifiedCategoriesHash.Clear();
+        }
+        #region Properties
+        public string Login
+        {
+            get { return login; }
+            set { login = value; }
+        }
+        public string DST
+        {
+            get { return dst; }
+            set { dst = value; }
+        }
+        public string StipendSinceLogin
+        {
+            get { return stipendSinceLogin; }
+            set { stipendSinceLogin = value; }
+        }
+        public string Gendered
+        {
+            get { return gendered; }
+            set { gendered = value; }
+        }
+        public string EverLoggedIn
+        {
+            get { return everLoggedIn; }
+            set { everLoggedIn = value; }
+        }
+        public uint SimPort
+        {
+            get { return simPort; }
+            set { simPort = value; }
+        }
+        public uint SimHttpPort
+        {
+            get { return simHttpPort; }
+            set { simHttpPort = value; }
+        }
+        public string SimAddress
+        {
+            get { return simAddress; }
+            set { simAddress = value; }
+        }
+        public UUID AgentID
+        {
+            get { return agentID; }
+            set { agentID = value; }
+        }
+        public UUID SessionID
+        {
+            get { return sessionID; }
+            set { sessionID = value; }
+        }
+        public UUID SecureSessionID
+        {
+            get { return secureSessionID; }
+            set { secureSessionID = value; }
+        }
+        public Int32 CircuitCode
+        {
+            get { return circuitCode; }
+            set { circuitCode = value; }
+        }
+        public uint RegionX
+        {
+            get { return regionX; }
+            set { regionX = value; }
+        }
+        public uint RegionY
+        {
+            get { return regionY; }
+            set { regionY = value; }
+        }
+        public string SunTexture
+        {
+            get { return sunTexture; }
+            set { sunTexture = value; }
+        }
+        public string CloudTexture
+        {
+            get { return cloudTexture; }
+            set { cloudTexture = value; }
+        }
+        public string MoonTexture
+        {
+            get { return moonTexture; }
+            set { moonTexture = value; }
+        }
+        public string Firstname
+        {
+            get { return firstname; }
+            set { firstname = value; }
+        }
+        public string Lastname
+        {
+            get { return lastname; }
+            set { lastname = value; }
+        }
+        public string AgentAccess
+        {
+            get { return agentAccess; }
+            set { agentAccess = value; }
+        }
+        public string AgentAccessMax
+        {
+            get { return agentAccessMax; }
+            set { agentAccessMax = value; }
+        }
+        public string StartLocation
+        {
+            get { return startLocation; }
+            set { startLocation = value; }
+        }
+        public string LookAt
+        {
+            get { return lookAt; }
+            set { lookAt = value; }
+        }
+        public string SeedCapability
+        {
+            get { return seedCapability; }
+            set { seedCapability = value; }
+        }
+        public string ErrorReason
+        {
+            get { return errorReason; }
+            set { errorReason = value; }
+        }
+        public string ErrorMessage
+        {
+            get { return errorMessage; }
+            set { errorMessage = value; }
+        }
+        public ArrayList InventoryRoot
+        {
+            get { return inventoryRoot; }
+            set { inventoryRoot = value; }
+        }
+        public ArrayList InventorySkeleton
+        {
+            get { return agentInventory; }
+            set { agentInventory = value; }
+        }
+        public ArrayList InventoryLibrary
+        {
+            get { return inventoryLibrary; }
+            set { inventoryLibrary = value; }
+        }
+        public ArrayList InventoryLibraryOwner
+        {
+            get { return inventoryLibraryOwner; }
+            set { inventoryLibraryOwner = value; }
+        }
+        public ArrayList InventoryLibRoot
+        {
+            get { return inventoryLibRoot; }
+            set { inventoryLibRoot = value; }
+        }
+        public ArrayList ActiveGestures
+        {
+            get { return activeGestures; }
+            set { activeGestures = value; }
+        }
+                
+        public string Home
+        {
+            get { return home; }
+            set { home = value; }
+        }
+        public string Message
+        {
+            get { return welcomeMessage; }
+            set { welcomeMessage = value; }
+        }
+        public BuddyList BuddList
+        {
+            get { return m_buddyList; }
+            set { m_buddyList = value; }
+        }
+        #endregion
+        public class UserInfo
+        {
+            public string firstname;
+            public string lastname;
+            public ulong homeregionhandle;
+            public Vector3 homepos;
+            public Vector3 homelookat;
+        }
+        public class BuddyList
+        {
+            public List<BuddyInfo> Buddies = new List<BuddyInfo>();
+            public void AddNewBuddy(BuddyInfo buddy)
+            {
+                if (!Buddies.Contains(buddy))
+                {
+                    Buddies.Add(buddy);
+                }
+            }
+            public ArrayList ToArray()
+            {
+                ArrayList buddyArray = new ArrayList();
+                foreach (BuddyInfo buddy in Buddies)
+                {
+                    buddyArray.Add(buddy.ToHashTable());
+                }
+                return buddyArray;
+            }
+            public class BuddyInfo
+            {
+                public int BuddyRightsHave = 1;
+                public int BuddyRightsGiven = 1;
+                public UUID BuddyID;
+                public BuddyInfo(string buddyID)
+                {
+                    BuddyID = new UUID(buddyID);
+                }
+                public BuddyInfo(UUID buddyID)
+                {
+                    BuddyID = buddyID;
+                }
+                public Hashtable ToHashTable()
+                {
+                    Hashtable hTable = new Hashtable();
+                    hTable["buddy_rights_has"] = BuddyRightsHave;
+                    hTable["buddy_rights_given"] = BuddyRightsGiven;
+                    hTable["buddy_id"] = BuddyID.ToString();
+                    return hTable;
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
new file mode 100644
index 0000000..25a65b5
--- /dev/null
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -0,0 +1,274 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+namespace OpenSim.Services.LLLoginService
+{
+    public class LLLoginService : ILoginService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IUserAccountService m_UserAccountService;
+        private IAuthenticationService m_AuthenticationService;
+        private IInventoryService m_InventoryService;
+        private IGridService m_GridService;
+        private IPresenceService m_PresenceService;
+        private ISimulationService m_LocalSimulationService;
+        private string m_DefaultRegionName;
+        private string m_RemoteSimulationDll;
+        public LLLoginService(IConfigSource config, ISimulationService simService)
+        {
+            IConfig serverConfig = config.Configs["LoginService"];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section LoginService in config file"));
+            string accountService = serverConfig.GetString("UserAccountService", String.Empty);
+            string authService = serverConfig.GetString("AuthenticationService", String.Empty);
+            string invService = serverConfig.GetString("InventoryService", String.Empty);
+            string gridService = serverConfig.GetString("GridService", String.Empty);
+            string presenceService = serverConfig.GetString("PresenceService", String.Empty);
+            m_DefaultRegionName = serverConfig.GetString("DefaultRegion", String.Empty);
+            m_RemoteSimulationDll = serverConfig.GetString("RemoteSimulationService", String.Empty);
+            // These 3 are required; the other 2 aren't
+            if (accountService == string.Empty || authService == string.Empty ||
+                invService == string.Empty)
+                throw new Exception("LoginService is missing service specifications");
+            Object[] args = new Object[] { config };
+            m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
+            m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args);
+            m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+            if (gridService != string.Empty)
+                m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
+            if (presenceService != string.Empty)
+                m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
+            m_LocalSimulationService = simService;
+        }
+        public LLLoginService(IConfigSource config) : this(config, null)
+        {
+        }
+        public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation)
+        {
+            bool success = false;
+            // Get the account and check that it exists
+            UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero, firstName, lastName);
+            if (account == null)
+                return LLFailedLoginResponse.UserProblem;
+            // Authenticate this user
+            string token = m_AuthenticationService.Authenticate(account.PrincipalID, passwd, 30);
+            UUID secureSession = UUID.Zero;
+            if ((token == string.Empty) || (token != string.Empty && !UUID.TryParse(token, out secureSession)))
+                return LLFailedLoginResponse.UserProblem;
+            // Get the user's inventory
+            List<InventoryFolderBase> inventorySkel = m_InventoryService.GetInventorySkeleton(account.PrincipalID);
+            if ((inventorySkel == null) || (inventorySkel != null && inventorySkel.Count == 0))
+                return LLFailedLoginResponse.InventoryProblem;
+            // Login the presence
+            UUID session = UUID.Random();
+            if (m_PresenceService != null)
+            {
+                success = m_PresenceService.LoginAgent(account.PrincipalID.ToString(), session, secureSession);
+                if (!success)
+                    return LLFailedLoginResponse.GridProblem;
+            }
+            // Find the destination region/grid
+            string where = string.Empty;
+            Vector3 position = Vector3.Zero;
+            Vector3 lookAt = Vector3.Zero;
+            GridRegion destination = FindDestination(account, session, startLocation, out where, out position, out lookAt);
+            if (destination == null)
+            {
+                m_PresenceService.LogoutAgent(session);
+                return LLFailedLoginResponse.GridProblem;
+            }
+            // Instantiate/get the simulation interface and launch an agent at the destination
+            ISimulationService simConnector = null;
+            success = false;
+            string reason = string.Empty;
+            Object[] args = new Object[] { destination };
+            // HG standalones have both a localSimulatonDll and a remoteSimulationDll
+            // non-HG standalones have just a localSimulationDll
+            // independent login servers have just a remoteSimulationDll
+            if (!startLocation.Contains("@") && (m_LocalSimulationService != null))
+                simConnector = m_LocalSimulationService;
+            else if (m_RemoteSimulationDll != string.Empty)
+                simConnector = ServerUtils.LoadPlugin<ISimulationService>(m_RemoteSimulationDll, args);
+            if (simConnector != null)
+                success = LaunchAgent(simConnector, destination, account, session, out reason);
+            if (!success)
+            {
+                m_PresenceService.LogoutAgent(session);
+                return LLFailedLoginResponse.GridProblem;
+            }
+            // Finally, fill out the response and return it
+            LLLoginResponse response = new LLLoginResponse();
+            //....
+            return response;
+        }
+        private GridRegion FindDestination(UserAccount account, UUID sessionID, string startLocation, out string where, out Vector3 position, out Vector3 lookAt)
+        {
+            where = "home";
+            position = new Vector3(128, 128, 0);
+            lookAt = new Vector3(0, 1, 0);
+            if (startLocation.Equals("home"))
+            {
+                // logging into home region
+                if (m_PresenceService == null || m_GridService == null)
+                    return null;
+                GridRegion region = null;
+                PresenceInfo pinfo = m_PresenceService.GetAgent(sessionID);
+                // this should succeed; if it doesn't there's something wrong with this grid
+                if (pinfo == null)
+                    return null;
+                if (pinfo.HomeRegionID.Equals(UUID.Zero))
+                    region = m_GridService.GetRegionByName(account.ScopeID, m_DefaultRegionName);
+                else
+                    region = m_GridService.GetRegionByUUID(account.ScopeID, pinfo.HomeRegionID);
+                return region;
+            }
+            else if (startLocation.Equals("last"))
+            {
+                // logging into last visited region
+                where = "last";
+                if (m_PresenceService == null || m_GridService == null)
+                    return null;
+                GridRegion region = null;
+                PresenceInfo pinfo = m_PresenceService.GetAgent(sessionID);
+                // this should succeed; if it doesn't there's something wrong with this grid
+                if (pinfo == null)
+                    return null;
+                if (pinfo.RegionID.Equals(UUID.Zero))
+                    region = m_GridService.GetRegionByName(account.ScopeID, m_DefaultRegionName);
+                else
+                {
+                    region = m_GridService.GetRegionByUUID(account.ScopeID, pinfo.RegionID);
+                    position = pinfo.Position;
+                    lookAt = pinfo.LookAt;
+                }
+                return region;
+            }
+            else
+            {
+                // free uri form
+                // e.g. New Moon&135&46  New Moon@osgrid.org:8002&153&34
+                where = "url";
+                Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$");
+                Match uriMatch = reURI.Match(startLocation);
+                if (uriMatch == null)
+                {
+                    m_log.InfoFormat("[LLLOGIN SERVICE]: Got Custom Login URI {0}, but can't process it", startLocation);
+                    return null;
+                }
+                else
+                {
+                    position = new Vector3(float.Parse(uriMatch.Groups["x"].Value),
+                                           float.Parse(uriMatch.Groups["y"].Value),
+                                           float.Parse(uriMatch.Groups["z"].Value));
+                    string regionName = uriMatch.Groups["region"].ToString();
+                    if (regionName != null)
+                    {
+                        if (!regionName.Contains("@"))
+                        {
+                            List<GridRegion> regions = m_GridService.GetRegionsByName(account.ScopeID, regionName, 1);
+                            if ((regions == null) || (regions != null && regions.Count == 0))
+                            {
+                                m_log.InfoFormat("[LLLOGIN SERVICE]: Got Custom Login URI {0}, can't locate region {1}", startLocation, regionName);
+                                return null;
+                            }
+                            return regions[0];
+                        }
+                        else
+                        {
+                            string[] parts = regionName.Split(new char[] { '@' });
+                            if (parts.Length < 2)
+                            {
+                                m_log.InfoFormat("[LLLOGIN SERVICE]: Got Custom Login URI {0}, can't locate region {1}", startLocation, regionName);
+                                return null;
+                            }
+                            // Valid specification of a remote grid
+                            regionName = parts[0];
+                            string domainLocator = parts[1];
+                            parts = domainLocator.Split(new char[] {':'});
+                            string domainName = parts[0];
+                            uint port = 0;
+                            if (parts.Length > 1)
+                                UInt32.TryParse(parts[1], out port);
+                            GridRegion region = new GridRegion();
+                            region.ExternalHostName = domainName;
+                            region.HttpPort = port;
+                            region.RegionName = regionName;
+                            return region;
+                        }
+                    }
+                    else
+                    {
+                        if (m_PresenceService == null || m_GridService == null)
+                            return null;
+                        return m_GridService.GetRegionByName(account.ScopeID, m_DefaultRegionName);
+                    }
+                }
+                //response.LookAt = "[r0,r1,r0]";
+                //// can be: last, home, safe, url
+                //response.StartLocation = "url";
+            }
+        }
+        private bool LaunchAgent(ISimulationService simConnector, GridRegion region, UserAccount account, UUID session, out string reason)
+        {
+            reason = string.Empty;
+            AgentCircuitData aCircuit = new AgentCircuitData();
+            aCircuit.AgentID = account.PrincipalID;
+            //aCircuit.Appearance = optional
+            //aCircuit.BaseFolder = irrelevant
+            //aCircuit.CapsPath = required
+            aCircuit.child = false;
+            //aCircuit.circuitcode = required
+            aCircuit.firstname = account.FirstName;
+            //aCircuit.InventoryFolder = irrelevant
+            aCircuit.lastname = account.LastName;
+            //aCircuit.SecureSessionID = required
+            aCircuit.SessionID = session;
+            //aCircuit.startpos = required
+            return simConnector.CreateAgent(region.RegionHandle, aCircuit, 0, out reason);
+        }
+    }
+}
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 2157462..fc6a6e1 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -41,27 +41,151 @@ namespace OpenSim.Services.PresenceService
 {
    public class PresenceService : PresenceServiceBase, IPresenceService
    {
-//        private static readonly ILog m_log =
+        private static readonly ILog m_log =
-//                LogManager.GetLogger(
+                LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+                MethodBase.GetCurrentMethod().DeclaringType);
        public PresenceService(IConfigSource config)
            : base(config)
        {
+            m_log.Debug("[PRESENCE SERVICE]: Starting presence service");
        }
-        public bool Report(PresenceInfo presence)
+        public bool LoginAgent(string userID, UUID sessionID,
+                UUID secureSessionID)
        {
-            PresenceData p = new PresenceData();
+            m_Database.Prune(userID);
-            p.Data = new Dictionary<string, string>();
-            p.UUID = presence.PrincipalID;
+            PresenceData[] d = m_Database.Get("UserID", userID);
-            p.currentRegion = presence.RegionID;
-            foreach (KeyValuePair<string, string> kvp in presence.Data)
+            PresenceData data = new PresenceData();
-                p.Data[kvp.Key] = kvp.Value;
-            return false;
+            data.UserID = userID;
+            data.RegionID = UUID.Zero;
+            data.SessionID = sessionID;
+            data.Data["SecureSessionID"] = secureSessionID.ToString();
+            data.Data["Online"] = "true";
+            data.Data["Login"] = Util.UnixTimeSinceEpoch().ToString();
+            if (d.Length > 0)
+            {
+                data.Data["HomeRegionID"] = d[0].Data["HomeRegionID"];
+                data.Data["HomePosition"] = d[0].Data["HomePosition"];
+                data.Data["HomeLookAt"] = d[0].Data["HomeLookAt"];
+            }
+            
+            m_Database.Store(data);
+            return true;
+        }
+        public bool LogoutAgent(UUID sessionID)
+        {
+            PresenceData data = m_Database.Get(sessionID);
+            if (data == null)
+                return false;
+            PresenceData[] d = m_Database.Get("UserID", data.UserID);
+            if (d.Length > 1)
+            {
+                m_Database.Delete("SessionID", sessionID.ToString());
+            }
+            data.Data["Online"] = "false";
+            data.Data["Logout"] = Util.UnixTimeSinceEpoch().ToString();
+            m_Database.Store(data);
+            return true;
+        }
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            m_Database.LogoutRegionAgents(regionID);
+            return true;
+        }
+        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
+            PresenceData pdata = m_Database.Get(sessionID);
+            if (pdata == null)
+                return false;
+            if (pdata.Data["Online"] == "false")
+                return false;
+            return m_Database.ReportAgent(sessionID, regionID,
+                        position.ToString(), lookAt.ToString());
+        }
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            PresenceInfo ret = new PresenceInfo();
+            
+            PresenceData data = m_Database.Get(sessionID);
+            if (data == null)
+                return null;
+            ret.UserID = data.UserID;
+            ret.RegionID = data.RegionID;
+            if (data.Data.ContainsKey("Online"))
+                ret.Online = bool.Parse(data.Data["Online"]);
+            if (data.Data.ContainsKey("Login"))
+                ret.Login = Util.ToDateTime(Convert.ToInt32(data.Data["Login"]));
+            if (data.Data.ContainsKey("Logout"))
+                ret.Logout = Util.ToDateTime(Convert.ToInt32(data.Data["Logout"]));
+            if (data.Data.ContainsKey("Position"))
+                ret.Position = Vector3.Parse(data.Data["Position"]);
+            if (data.Data.ContainsKey("LookAt"))
+                ret.LookAt = Vector3.Parse(data.Data["LookAt"]);
+            if (data.Data.ContainsKey("HomeRegionID"))
+                ret.HomeRegionID = new UUID(data.Data["HomeRegionID"]);
+            if (data.Data.ContainsKey("HomePosition"))
+                ret.HomePosition = Vector3.Parse(data.Data["HomePosition"]);
+            if (data.Data.ContainsKey("HomeLookAt"))
+                ret.HomeLookAt = Vector3.Parse(data.Data["HomeLookAt"]);
+            return ret;
+        }
+        public PresenceInfo[] GetAgents(string[] userIDs)
+        {
+            List<PresenceInfo> info = new List<PresenceInfo>();
+            foreach (string userIDStr in userIDs)
+            {
+                PresenceData[] data = m_Database.Get("UserID",
+                        userIDStr);
+                foreach (PresenceData d in data)
+                {
+                    PresenceInfo ret = new PresenceInfo();
+                    ret.UserID = d.UserID;
+                    ret.RegionID = d.RegionID;
+                    ret.Online = bool.Parse(d.Data["Online"]);
+                    ret.Login = Util.ToDateTime(Convert.ToInt32(
+                            d.Data["Login"]));
+                    ret.Logout = Util.ToDateTime(Convert.ToInt32(
+                            d.Data["Logout"]));
+                    ret.Position = Vector3.Parse(d.Data["Position"]);
+                    ret.LookAt = Vector3.Parse(d.Data["LookAt"]);
+                    ret.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
+                    ret.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
+                    ret.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
+                    info.Add(ret);
+                }
+            }
+            return info.ToArray();
+        }
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_Database.SetHomeLocation(userID, regionID, position, lookAt);
        }
    }
 }
diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
index 60a246b..3ca70c1 100644
--- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs
+++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Services.PresenceService
        {
            string dllName = String.Empty;
            string connString = String.Empty;
-            string realm = "agents";
+            string realm = "presence";
            //
            // Try reading the [DatabaseService] section, if it exists
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
new file mode 100644
index 0000000..c14651d
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -0,0 +1,184 @@
+/*
+ * 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 System.Collections.Generic;
+using OpenMetaverse;
+namespace OpenSim.Services.UserAccountService
+{
+    public class UserAccountService : UserAccountServiceBase, IUserAccountService
+    {
+        public UserAccountService(IConfigSource config) : base(config)
+        {
+        }
+        public UserAccount GetUserAccount(UUID scopeID, string firstName,
+                string lastName)
+        {
+            UserAccountData[] d;
+            if (scopeID != UUID.Zero)
+            {
+                d = m_Database.Get(
+                        new string[] {"ScopeID", "FirstName", "LastName"},
+                        new string[] {scopeID.ToString(), firstName, lastName});
+            }
+            else
+            {
+                d = m_Database.Get(
+                        new string[] {"FirstName", "LastName"},
+                        new string[] {firstName, lastName});
+            }
+            if (d.Length < 1)
+                return null;
+            return MakeUserAccount(d[0]);
+        }
+        private UserAccount MakeUserAccount(UserAccountData d)
+        {
+            UserAccount u = new UserAccount();
+            u.FirstName = d.FirstName;
+            u.LastName = d.LastName;
+            u.PrincipalID = d.PrincipalID;
+            u.ScopeID = d.ScopeID;
+            u.Email = d.Data["Email"].ToString();
+            u.Created = Convert.ToInt32(d.Data["Created"].ToString());
+            string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] {' '});
+            u.ServiceURLs = new Dictionary<string, object>();
+            foreach(string url in URLs)
+            {
+                string[] parts = url.Split(new char[] {'='});
+                if (parts.Length != 2)
+                    continue;
+                string name = System.Web.HttpUtility.UrlDecode(parts[0]);
+                string val = System.Web.HttpUtility.UrlDecode(parts[1]);
+                u.ServiceURLs[name] = val;
+            }
+            return u;
+        }
+        public UserAccount GetUserAccount(UUID scopeID, string email)
+        {
+            UserAccountData[] d;
+            if (scopeID != UUID.Zero)
+            {
+                d = m_Database.Get(
+                        new string[] {"ScopeID", "Email"},
+                        new string[] {scopeID.ToString(), email});
+            }
+            else
+            {
+                d = m_Database.Get(
+                        new string[] {"Email"},
+                        new string[] {email});
+            }
+            if (d.Length < 1)
+                return null;
+            return MakeUserAccount(d[0]);
+        }
+        
+        public UserAccount GetUserAccount(UUID scopeID, UUID principalID)
+        {
+            UserAccountData[] d;
+            if (scopeID != UUID.Zero)
+            {
+                d = m_Database.Get(
+                        new string[] {"ScopeID", "PrincipalID"},
+                        new string[] {scopeID.ToString(), principalID.ToString()});
+            }
+            else
+            {
+                d = m_Database.Get(
+                        new string[] {"PrincipalID"},
+                        new string[] {principalID.ToString()});
+            }
+            if (d.Length < 1)
+                return null;
+            return MakeUserAccount(d[0]);
+        }
+        public bool StoreUserAccount(UserAccount data)
+        {
+            UserAccountData d = new UserAccountData();
+            d.FirstName = data.FirstName;
+            d.LastName = data.LastName;
+            d.PrincipalID = data.PrincipalID;
+            d.ScopeID = data.ScopeID;
+            d.Data = new Dictionary<string,string>();
+            d.Data["Email"] = data.Email;
+            d.Data["Created"] = data.Created.ToString();
+            List<string> parts = new List<string>();
+            foreach (KeyValuePair<string,object> kvp in data.ServiceURLs)
+            {
+                string key = System.Web.HttpUtility.UrlEncode(kvp.Key);
+                string val = System.Web.HttpUtility.UrlEncode(kvp.Value.ToString());
+                parts.Add(key + "=" + val);
+            }
+            d.Data["ServiceURLs"] = string.Join(" ", parts.ToArray());
+            return m_Database.Store(d);
+        }
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+        {
+            UserAccountData[] d = m_Database.GetUsers(scopeID, query);
+            if (d == null)
+                return new List<UserAccount>();
+            List<UserAccount> ret = new List<UserAccount>();
+            foreach (UserAccountData data in d)
+                ret.Add(MakeUserAccount(data));
+            return ret;
+        }
+    }
+}
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserAccountService/UserAccountServiceBase.cs
index fea8b01..70ed594 100644
--- a/OpenSim/Services/UserService/UserServiceBase.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountServiceBase.cs
@@ -40,20 +40,29 @@ namespace OpenSim.Services.UserAccountService
        public UserAccountServiceBase(IConfigSource config) : base(config)
        {
+            string dllName = String.Empty;
+            string connString = String.Empty;
+            string realm = "useraccounts";
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
            IConfig userConfig = config.Configs["UserAccountService"];
            if (userConfig == null)
                throw new Exception("No UserAccountService configuration");
-            string dllName = userConfig.GetString("StorageProvider",
+            dllName = userConfig.GetString("StorageProvider", dllName);
-                    String.Empty);
            if (dllName == String.Empty)
                throw new Exception("No StorageProvider configured");
-            string connString = userConfig.GetString("ConnectionString",
+            connString = userConfig.GetString("ConnectionString", connString);
-                    String.Empty);
-            string realm = userConfig.GetString("Realm", "users");
+            realm = userConfig.GetString("Realm", realm);
            m_Database = LoadPlugin<IUserAccountData>(dllName, new Object[] {connString, realm});