13 files changed, 827 insertions, 148 deletions

diff --git a/OpenSim/Services/Interfaces/IAttachmentsService.cs b/OpenSim/Services/Interfaces/IAttachmentsService.cs
new file mode 100644
index 0000000..bdde369
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IAttachmentsService.cs
@@ -0,0 +1,17 @@
+////////////////////////////////////////////////////////////////
+//
+// (c) 2009, 2010 Careminster Limited and Melanie Thielker
+//
+// All rights reserved
+//
+using System;
+using Nini.Config;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IAttachmentsService
+    {
+        string Get(string id);
+        void Store(string id, string data);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs
index 9225773..9de261b 100644
--- a/OpenSim/Services/Interfaces/IAuthenticationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs
@@ -66,6 +66,17 @@ namespace OpenSim.Services.Interfaces
         bool Release(UUID principalID, string token);
 
         //////////////////////////////////////////////////////
+        // SetPassword for a principal
+        //
+        // This method exists for the service, but may or may not
+        // be served remotely. That is, the authentication
+        // handlers may not include one handler for this,
+        // because it's a bit risky. Such handlers require
+        // authentication/authorization.
+        //
+        bool SetPassword(UUID principalID, string passwd);
+
+        //////////////////////////////////////////////////////
         // Grid
         //
         // We no longer need a shared secret between grid
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
new file mode 100644
index 0000000..de3bcf9
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -0,0 +1,241 @@
+/*
+ * 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 OpenSim.Framework;
+
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IAvatarService
+    {
+        /// <summary>
+        /// Called by the login service
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        AvatarData GetAvatar(UUID userID);
+
+        /// <summary>
+        /// Called by everyone who can change the avatar data (so, regions)
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="avatar"></param>
+        /// <returns></returns>
+        bool SetAvatar(UUID userID, AvatarData avatar);
+
+        /// <summary>
+        /// Not sure if it's needed
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        bool ResetAvatar(UUID userID);
+
+        /// <summary>
+        /// These methods raison d'etre: 
+        /// No need to send the entire avatar data (SetAvatar) for changing attachments
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="attach"></param>
+        /// <returns></returns>
+        bool SetItems(UUID userID, string[] names, string[] values);
+        bool RemoveItems(UUID userID, string[] names);
+    }
+
+    /// <summary>
+    /// Each region/client that uses avatars will have a data structure
+    /// of this type representing the avatars.
+    /// </summary>
+    public class AvatarData
+    {
+        // This pretty much determines which name/value pairs will be
+        // present below. The name/value pair describe a part of
+        // the avatar. For SL avatars, these would be "shape", "texture1",
+        // etc. For other avatars, they might be "mesh", "skin", etc.
+        // The value portion is a URL that is expected to resolve to an
+        // asset of the type required by the handler for that field.
+        // It is required that regions can access these URLs. Allowing
+        // direct access by a viewer is not required, and, if provided,
+        // may be read-only. A "naked" UUID can be used to refer to an
+        // asset int he current region's asset service, which is not
+        // portable, but allows legacy appearance to continue to
+        // function. Closed, LL-based  grids will never need URLs here.
+
+        public int AvatarType;
+        public Dictionary<string,string> Data;
+
+        public AvatarData()
+        {
+        }
+
+        public AvatarData(Dictionary<string, object> kvp)
+        {
+            Data = new Dictionary<string, string>();
+
+            if (kvp.ContainsKey("AvatarType"))
+                Int32.TryParse(kvp["AvatarType"].ToString(), out AvatarType);
+
+            foreach (KeyValuePair<string, object> _kvp in kvp)
+            {
+                if (_kvp.Value != null)
+                    Data[_kvp.Key] = _kvp.Value.ToString();
+            }
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+
+            result["AvatarType"] = AvatarType.ToString();
+            foreach (KeyValuePair<string, string> _kvp in Data)
+            {
+                if (_kvp.Value != null)
+                    result[_kvp.Key] = _kvp.Value;
+            }
+            return result;
+        }
+
+        public AvatarData(AvatarAppearance appearance)
+        {
+            AvatarType = 1; // SL avatars
+            Data = new Dictionary<string, string>();
+
+            Data["Serial"] = appearance.Serial.ToString();
+            // Wearables
+            Data["AvatarHeight"] = appearance.AvatarHeight.ToString();
+            Data["BodyItem"] = appearance.BodyItem.ToString();
+            Data["EyesItem"] = appearance.EyesItem.ToString();
+            Data["GlovesItem"] = appearance.GlovesItem.ToString();
+            Data["HairItem"] = appearance.HairItem.ToString();
+            Data["JacketItem"] = appearance.JacketItem.ToString();
+            Data["PantsItem"] = appearance.PantsItem.ToString();
+            Data["ShirtItem"] = appearance.ShirtItem.ToString();
+            Data["ShoesItem"] = appearance.ShoesItem.ToString();
+            Data["SkinItem"] = appearance.SkinItem.ToString();
+            Data["SkirtItem"] = appearance.SkirtItem.ToString();
+            Data["SocksItem"] = appearance.SocksItem.ToString();
+            Data["UnderPantsItem"] = appearance.UnderPantsItem.ToString();
+            Data["UnderShirtItem"] = appearance.UnderShirtItem.ToString();
+
+            Data["BodyAsset"] = appearance.BodyAsset.ToString();
+            Data["EyesAsset"] = appearance.EyesAsset.ToString();
+            Data["GlovesAsset"] = appearance.GlovesAsset.ToString();
+            Data["HairAsset"] = appearance.HairAsset.ToString();
+            Data["JacketAsset"] = appearance.JacketAsset.ToString();
+            Data["PantsAsset"] = appearance.PantsAsset.ToString();
+            Data["ShirtAsset"] = appearance.ShirtAsset.ToString();
+            Data["ShoesAsset"] = appearance.ShoesAsset.ToString();
+            Data["SkinAsset"] = appearance.SkinAsset.ToString();
+            Data["SkirtAsset"] = appearance.SkirtAsset.ToString();
+            Data["SocksAsset"] = appearance.SocksAsset.ToString();
+            Data["UnderPantsAsset"] = appearance.UnderPantsAsset.ToString();
+            Data["UnderShirtAsset"] = appearance.UnderShirtAsset.ToString();
+
+            // Attachments
+            Hashtable attachs = appearance.GetAttachments();
+            if (attachs != null)
+                foreach (DictionaryEntry dentry in attachs)
+                {
+                    if (dentry.Value != null)
+                    {
+                        Hashtable tab = (Hashtable)dentry.Value;
+                        if (tab.ContainsKey("item") && tab["item"] != null)
+                            Data["_ap_" + dentry.Key] = tab["item"].ToString();
+                    }
+                }
+        }
+
+        public AvatarAppearance ToAvatarAppearance(UUID owner)
+        {
+            AvatarAppearance appearance = new AvatarAppearance(owner);
+            try
+            {
+                appearance.Serial = Int32.Parse(Data["Serial"]);
+
+                // Wearables
+                appearance.BodyItem = UUID.Parse(Data["BodyItem"]);
+                appearance.EyesItem = UUID.Parse(Data["EyesItem"]);
+                appearance.GlovesItem = UUID.Parse(Data["GlovesItem"]);
+                appearance.HairItem = UUID.Parse(Data["HairItem"]);
+                appearance.JacketItem = UUID.Parse(Data["JacketItem"]);
+                appearance.PantsItem = UUID.Parse(Data["PantsItem"]);
+                appearance.ShirtItem = UUID.Parse(Data["ShirtItem"]);
+                appearance.ShoesItem = UUID.Parse(Data["ShoesItem"]);
+                appearance.SkinItem = UUID.Parse(Data["SkinItem"]);
+                appearance.SkirtItem = UUID.Parse(Data["SkirtItem"]);
+                appearance.SocksItem = UUID.Parse(Data["SocksItem"]);
+                appearance.UnderPantsItem = UUID.Parse(Data["UnderPantsItem"]);
+                appearance.UnderShirtItem = UUID.Parse(Data["UnderShirtItem"]);
+
+                appearance.BodyAsset = UUID.Parse(Data["BodyAsset"]);
+                appearance.EyesAsset = UUID.Parse(Data["EyesAsset"]);
+                appearance.GlovesAsset = UUID.Parse(Data["GlovesAsset"]);
+                appearance.HairAsset = UUID.Parse(Data["HairAsset"]);
+                appearance.JacketAsset = UUID.Parse(Data["JacketAsset"]);
+                appearance.PantsAsset = UUID.Parse(Data["PantsAsset"]);
+                appearance.ShirtAsset = UUID.Parse(Data["ShirtAsset"]);
+                appearance.ShoesAsset = UUID.Parse(Data["ShoesAsset"]);
+                appearance.SkinAsset = UUID.Parse(Data["SkinAsset"]);
+                appearance.SkirtAsset = UUID.Parse(Data["SkirtAsset"]);
+                appearance.SocksAsset = UUID.Parse(Data["SocksAsset"]);
+                appearance.UnderPantsAsset = UUID.Parse(Data["UnderPantsAsset"]);
+                appearance.UnderShirtAsset = UUID.Parse(Data["UnderShirtAsset"]);
+
+                // Attachments
+                Dictionary<string, string> attchs = new Dictionary<string, string>();
+                foreach (KeyValuePair<string, string> _kvp in Data)
+                    if (_kvp.Key.StartsWith("_ap_"))
+                        attchs[_kvp.Key] = _kvp.Value;
+                Hashtable aaAttachs = new Hashtable();
+                foreach (KeyValuePair<string, string> _kvp in attchs)
+                {
+                    string pointStr = _kvp.Key.Substring(4);
+                    int point = 0;
+                    if (!Int32.TryParse(pointStr, out point))
+                        continue;
+                    Hashtable tmp = new Hashtable();
+                    UUID uuid = UUID.Zero;
+                    UUID.TryParse(_kvp.Value, out uuid);
+                    tmp["item"] = uuid;
+                    tmp["asset"] = UUID.Zero.ToString();
+                    aaAttachs[point] = tmp;
+                }
+                appearance.SetAttachments(aaAttachs);
+            }
+            catch { }
+
+            return appearance;
+        }
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs
new file mode 100644
index 0000000..2692c48
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IFriendsService.cs
@@ -0,0 +1,80 @@
+/*
+ * 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 OpenMetaverse;
+using OpenSim.Framework;
+using System.Collections.Generic;
+
+namespace OpenSim.Services.Interfaces
+{
+    public class FriendInfo
+    {
+        public UUID PrincipalID;
+        public string Friend;
+        public int MyFlags;
+        public int TheirFlags;
+
+        public FriendInfo()
+        {
+        }
+
+        public FriendInfo(Dictionary<string, object> kvp)
+        {
+            PrincipalID = UUID.Zero;
+            if (kvp.ContainsKey("PrincipalID") && kvp["PrincipalID"] != null)
+                UUID.TryParse(kvp["PrincipalID"].ToString(), out PrincipalID);
+            Friend = string.Empty;
+            if (kvp.ContainsKey("Friend") && kvp["Friend"] != null)
+                Friend = kvp["Friend"].ToString();
+            MyFlags = 0;
+            if (kvp.ContainsKey("MyFlags") && kvp["MyFlags"] != null)
+                Int32.TryParse(kvp["MyFlags"].ToString(), out MyFlags);
+            TheirFlags = 0;
+            if (kvp.ContainsKey("TheirFlags") && kvp["TheirFlags"] != null)
+                Int32.TryParse(kvp["TheirFlags"].ToString(), out TheirFlags);
+        }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["PricipalID"] = PrincipalID.ToString();
+            result["Friend"] = Friend;
+            result["MyFlags"] = MyFlags.ToString();
+            result["TheirFlags"] = TheirFlags.ToString();
+
+            return result;
+        }
+    }
+
+    public interface IFriendsService
+    {
+        FriendInfo[] GetFriends(UUID PrincipalID);
+        bool StoreFriend(UUID PrincipalID, string Friend, int flags);
+        bool Delete(UUID PrincipalID, string Friend);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
new file mode 100644
index 0000000..ca7b9b3
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IGatekeeperService.cs
@@ -0,0 +1,59 @@
+/*
+ * 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.Net;
+using System.Collections.Generic;
+
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IGatekeeperService
+    {
+        bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason);
+        GridRegion GetHyperlinkRegion(UUID regionID);
+
+        bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
+
+    }
+
+    /// <summary>
+    /// HG1.5 only
+    /// </summary>
+    public interface IUserAgentService
+    {
+        bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, out string reason);
+        void LogoutAgent(UUID userID, UUID sessionID);
+        GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
+
+        bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);
+        bool VerifyAgent(UUID sessionID, string token);
+        bool VerifyClient(UUID sessionID, string token);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 5135f6d..e55b633 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -90,6 +90,10 @@ namespace OpenSim.Services.Interfaces
 
         List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax);
 
+        List<GridRegion> GetDefaultRegions(UUID scopeID);
+        List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y);
+
+        int GetRegionFlags(UUID scopeID, UUID regionID);
     }
 
     public class GridRegion
@@ -154,7 +158,8 @@ namespace OpenSim.Services.Interfaces
         public UUID TerrainImage = UUID.Zero;
         public byte Access;
         public int  Maturity;
-        public string RegionSecret;
+        public string RegionSecret = string.Empty;
+        public string Token = string.Empty;
 
         public GridRegion()
         {
@@ -200,12 +205,6 @@ namespace OpenSim.Services.Interfaces
             Maturity = ConvertFrom.RegionSettings.Maturity;
             RegionSecret = ConvertFrom.regionSecret;
             EstateOwner = ConvertFrom.EstateSettings.EstateOwner;
-            if (EstateOwner == UUID.Zero)
-            {
-                EstateOwner = ConvertFrom.MasterAvatarAssignedUUID;
-                ConvertFrom.EstateSettings.EstateOwner = EstateOwner;
-                ConvertFrom.EstateSettings.Save();
-            }
         }
 
         public GridRegion(GridRegion ConvertFrom)
@@ -267,8 +266,6 @@ namespace OpenSim.Services.Interfaces
 
                 return new IPEndPoint(ia, m_internalEndPoint.Port);
             }
-
-            set { m_externalHostName = value.ToString(); }
         }
 
         public string ExternalHostName
@@ -288,11 +285,6 @@ namespace OpenSim.Services.Interfaces
             get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
         }
 
-        public int getInternalEndPointPort()
-        {
-            return m_internalEndPoint.Port;
-        }
-
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> kvp = new Dictionary<string, object>();
@@ -308,6 +300,7 @@ namespace OpenSim.Services.Interfaces
             kvp["access"] = Access.ToString();
             kvp["regionSecret"] = RegionSecret;
             kvp["owner_uuid"] = EstateOwner.ToString();
+            kvp["Token"] = Token.ToString();
             // Maturity doesn't seem to exist in the DB
             return kvp;
         }
@@ -365,6 +358,9 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("owner_uuid"))
                 EstateOwner = new UUID(kvp["owner_uuid"].ToString());
 
+            if (kvp.ContainsKey("Token"))
+                Token = kvp["Token"].ToString();
+
         }
     }
 
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
new file mode 100644
index 0000000..e629dff
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    /// <summary>
+    /// Records user information specific to a grid but which is not part of a user's account.
+    /// </summary>
+    public class GridUserInfo
+    {
+        public string UserID;
+        
+        public UUID HomeRegionID;
+        public Vector3 HomePosition;
+        public Vector3 HomeLookAt;
+
+        public UUID LastRegionID;
+        public Vector3 LastPosition;
+        public Vector3 LastLookAt;
+        
+        public bool Online;
+        public DateTime Login;
+        public DateTime Logout;
+
+        public GridUserInfo() {}
+        
+        public GridUserInfo(Dictionary<string, object> kvp)
+        {
+            if (kvp.ContainsKey("UserID"))
+                UserID = kvp["UserID"].ToString();
+
+            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);
+
+            if (kvp.ContainsKey("LastRegionID"))
+                UUID.TryParse(kvp["LastRegionID"].ToString(), out HomeRegionID);
+            if (kvp.ContainsKey("LastPosition"))
+                Vector3.TryParse(kvp["LastPosition"].ToString(), out LastPosition);
+            if (kvp.ContainsKey("LastLookAt"))
+                Vector3.TryParse(kvp["LastLookAt"].ToString(), out LastLookAt);
+
+            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("Online"))
+                Boolean.TryParse(kvp["Online"].ToString(), out Online);
+
+        }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["UserID"] = UserID;
+
+            result["HomeRegionID"] = HomeRegionID.ToString();
+            result["HomePosition"] = HomePosition.ToString();
+            result["HomeLookAt"] = HomeLookAt.ToString();
+
+            result["LastRegionID"] = LastRegionID.ToString();
+            result["LastPosition"] = LastPosition.ToString();
+            result["LastLookAt"] = LastLookAt.ToString();
+
+            result["Online"] = Online.ToString();
+            result["Login"] = Login.ToString();
+            result["Logout"] = Logout.ToString();
+
+            
+            return result;
+        }
+    }
+    
+    public interface IGridUserService
+    {
+        GridUserInfo LoggedIn(string userID);
+        bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
+        
+        bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt);
+        bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
+    
+        GridUserInfo GetGridUserInfo(string userID);
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/IHyperlink.cs b/OpenSim/Services/Interfaces/ILibraryService.cs
index ed3ff23..861cf0e 100644
--- a/OpenSim/Services/Interfaces/IHyperlink.cs
+++ b/OpenSim/Services/Interfaces/ILibraryService.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,25 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using System;
+using System.Collections.Generic;
 
+using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Services.Interfaces
 {
-    public interface IHyperlinkService
+    public interface ILibraryService
     {
-        GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor); 
-        GridRegion GetHyperlinkRegion(ulong handle);
-        ulong FindRegionHandle(ulong handle);
-
-        bool SendUserInformation(GridRegion region, AgentCircuitData aCircuit);
-        void AdjustUserInformation(AgentCircuitData aCircuit);
+        InventoryFolderImpl LibraryRootFolder { get; }
 
-        bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome);
-        void AcceptUser(ForeignUserProfileData user, GridRegion home);
-
-        bool IsLocalUser(UUID userID);
+        Dictionary<UUID, InventoryFolderImpl> GetAllFolders();
     }
+
 }
diff --git a/OpenSim/Services/Interfaces/ILoginService.cs b/OpenSim/Services/Interfaces/ILoginService.cs
new file mode 100644
index 0000000..9e57339
--- /dev/null
+++ b/OpenSim/Services/Interfaces/ILoginService.cs
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+
+using OpenMetaverse.StructuredData;
+using OpenMetaverse;
+
+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, UUID scopeID, string clientVersion, IPEndPoint clientIP);
+        Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP);
+    }
+
+
+}
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index aa1c5bf..abbae2c 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,68 @@ 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);
+        }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["UserID"] = UserID;
+            result["RegionID"] = RegionID.ToString();
+
+            return result;
+        }
+
+        public static PresenceInfo[] GetOnlinePresences(PresenceInfo[] pinfos)
+        {
+            if (pinfos == null)
+                return null;
+
+            List<PresenceInfo> lst = new List<PresenceInfo>(pinfos);
+            lst = lst.FindAll(delegate(PresenceInfo each) { return each.Online; });
+
+            return lst.ToArray();
+        }
+
+        public static PresenceInfo GetOnlinePresence(PresenceInfo[] pinfos)
+        {
+            pinfos = GetOnlinePresences(pinfos);
+            if (pinfos != null && pinfos.Length >= 1)
+                return pinfos[0];
+
+            return null;
+        }
     }
 
     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);
+
+        PresenceInfo GetAgent(UUID sessionID);
+        PresenceInfo[] GetAgents(string[] userIDs);
     }
 }
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index a169ab7..67d7cbe 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -29,13 +29,18 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
 namespace OpenSim.Services.Interfaces
 {
     public interface ISimulationService
     {
+        IScene GetScene(ulong regionHandle);
+        ISimulationService GetInnerService();
+
         #region Agents
 
-        bool CreateAgent(ulong regionHandle, AgentCircuitData aCircuit, out string reason);
+        bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason);
 
         /// <summary>
         /// Full child agent update.
@@ -43,7 +48,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionHandle"></param>
         /// <param name="data"></param>
         /// <returns></returns>
-        bool UpdateAgent(ulong regionHandle, AgentData data);
+        bool UpdateAgent(GridRegion destination, AgentData data);
 
         /// <summary>
         /// Short child agent update, mostly for position.
@@ -51,9 +56,9 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionHandle"></param>
         /// <param name="data"></param>
         /// <returns></returns>
-        bool UpdateAgent(ulong regionHandle, AgentPosition data);
+        bool UpdateAgent(GridRegion destination, AgentPosition data);
 
-        bool RetrieveAgent(ulong regionHandle, UUID id, out IAgentData agent);
+        bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent);
 
         /// <summary>
         /// Message from receiving region to departing region, telling it got contacted by the client.
@@ -63,7 +68,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="id"></param>
         /// <param name="uri"></param>
         /// <returns></returns>
-        bool ReleaseAgent(ulong regionHandle, UUID id, string uri);
+        bool ReleaseAgent(UUID originRegion, UUID id, string uri);
 
         /// <summary>
         /// Close agent.
@@ -71,7 +76,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionHandle"></param>
         /// <param name="id"></param>
         /// <returns></returns>
-        bool CloseAgent(ulong regionHandle, UUID id);
+        bool CloseAgent(GridRegion destination, UUID id);
 
         #endregion Agents
 
@@ -84,7 +89,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="sog"></param>
         /// <param name="isLocalCall"></param>
         /// <returns></returns>
-        bool CreateObject(ulong regionHandle, ISceneObject sog, bool isLocalCall);
+        bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall);
 
         /// <summary>
         /// Create an object from the user's inventory in the destination region. 
@@ -94,15 +99,9 @@ namespace OpenSim.Services.Interfaces
         /// <param name="userID"></param>
         /// <param name="itemID"></param>
         /// <returns></returns>
-        bool CreateObject(ulong regionHandle, UUID userID, UUID itemID);
+        bool CreateObject(GridRegion destination, UUID userID, UUID itemID);
 
         #endregion Objects
 
-        #region Regions
-
-        bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion);
-
-        #endregion Regions
-
     }
 }
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
new file mode 100644
index 0000000..e316731
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public class UserAccount
+    {
+        public UserAccount()
+        {
+        }
+
+        public UserAccount(UUID principalID)
+        {
+            PrincipalID = principalID;
+        }
+
+        public UserAccount(UUID scopeID, string firstName, string lastName, string email)
+        {
+            PrincipalID = UUID.Random();
+            ScopeID = scopeID;
+            FirstName = firstName;
+            LastName = lastName;
+            Email = email;
+            ServiceURLs = new Dictionary<string, object>();
+            // Created = ???
+        }
+
+        public string FirstName;
+        public string LastName;
+        public string Email;
+        public UUID PrincipalID;
+        public UUID ScopeID;
+        public int UserLevel;
+        public int UserFlags;
+        public string UserTitle;
+
+        public Dictionary<string, object> ServiceURLs;
+
+        public int Created;
+
+        public string Name
+        {
+            get { return FirstName + " " + LastName; }
+        }
+
+        public UserAccount(Dictionary<string, object> kvp)
+        {
+            if (kvp.ContainsKey("FirstName"))
+                FirstName = kvp["FirstName"].ToString();
+            if (kvp.ContainsKey("LastName"))
+                LastName = kvp["LastName"].ToString();
+            if (kvp.ContainsKey("Email"))
+                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("UserLevel"))
+                UserLevel = Convert.ToInt32(kvp["UserLevel"].ToString());
+            if (kvp.ContainsKey("UserFlags"))
+                UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString());
+            if (kvp.ContainsKey("UserTitle"))
+                UserTitle = kvp["UserTitle"].ToString();
+
+            if (kvp.ContainsKey("Created"))
+                Convert.ToInt32(kvp["Created"].ToString());
+            if (kvp.ContainsKey("ServiceURLs") && kvp["ServiceURLs"] != null)
+            {
+                ServiceURLs = new Dictionary<string, object>();
+                string str = kvp["ServiceURLs"].ToString();
+                if (str != string.Empty)
+                {
+                    string[] parts = str.Split(new char[] { ';' });
+                    Dictionary<string, object> dic = new Dictionary<string, object>();
+                    foreach (string s in parts)
+                    {
+                        string[] parts2 = s.Split(new char[] { '*' });
+                        if (parts2.Length == 2)
+                            ServiceURLs[parts2[0]] = parts2[1];
+                    }
+                }
+            }
+        }
+
+        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["UserLevel"] = UserLevel.ToString();
+            result["UserFlags"] = UserFlags.ToString();
+            result["UserTitle"] = UserTitle;
+
+            string str = string.Empty;
+            foreach (KeyValuePair<string, object> kvp in ServiceURLs)
+            {
+                str += kvp.Key + "*" + (kvp.Value == null ? "" : kvp.Value) + ";";
+            }
+            result["ServiceURLs"] = str;
+
+            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);
+
+        /// <summary>
+        /// Returns the list of avatars that matches both the search criterion and the scope ID passed
+        /// </summary>
+        /// <param name="scopeID"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        List<UserAccount> GetUserAccounts(UUID scopeID, string query);
+
+        /// <summary>
+        /// Store the data given, wich replaces the stored data, therefore must be complete.
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        bool StoreUserAccount(UserAccount data);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
deleted file mode 100644
index 92bd8ef..0000000
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ /dev/null
@@ -1,103 +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 System.Collections.Generic;
-using OpenMetaverse;
-
-namespace OpenSim.Services.Interfaces
-{
-    public class UserAccount
-    {
-        public UserAccount()
-        {
-        }
-
-        public UserAccount(UUID userID, UUID homeRegionID, float homePositionX,
-                float homePositionY, float homePositionZ, float homeLookAtX,
-                float homeLookAtY, float homeLookAtZ)
-        {
-            UserID = userID;
-            HomeRegionID = homeRegionID;
-            HomePositionX = homePositionX;
-            HomePositionY = homePositionY;
-            HomePositionZ = homePositionZ;
-            HomeLookAtX = homeLookAtX;
-            HomeLookAtY = homeLookAtY;
-            HomeLookAtZ = homeLookAtZ;
-        }
-
-        public string FirstName;
-        public string LastName;
-        public UUID UserID;
-        public UUID ScopeID;
-
-        // For informational purposes only!
-        //
-        public string HomeRegionName;
-
-        public UUID HomeRegionID;
-        public float HomePositionX;
-        public float HomePositionY;
-        public float HomePositionZ;
-        public float HomeLookAtX;
-        public float HomeLookAtY;
-        public float HomeLookAtZ;
-
-        // These are here because they
-        // concern the account rather than
-        // the profile. They just happen to
-        // be used in the Linden profile as well
-        //
-        public int GodLevel;
-        public int UserFlags;
-        public string AccountType;
-
-    };
-
-    public interface IUserAccountService
-    {
-        UserAccount GetUserAccount(UUID scopeID, UUID userID);
-        UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
-        // Returns the list of avatars that matches both the search
-        // criterion and the scope ID passed
-        //
-        List<UserAccount> GetUserAccount(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
-        //
-        bool SetUserAccount(UserAccount data, UUID PrincipalID, string token);
-        
-        // Creates a user data record
-        bool CreateUserAccount(UserAccount data, UUID PrincipalID, string token);
-    }
-}