21 files changed, 163 insertions, 175 deletions

diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
index 3b4fda2..af92326 100644
--- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
+++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Services.Interfaces
 {
     public class AgentPrefs
     {
-        public AgentPrefs(UUID principalID) 
+        public AgentPrefs(UUID principalID)
         {
             PrincipalID = principalID;
         }
@@ -101,7 +101,7 @@ namespace OpenSim.Services.Interfaces
         // DefaultObjectPermMasks
         public int PermEveryone = 0;
         public int PermGroup = 0;
-        public int PermNextOwner = 532480;
+        public int PermNextOwner = 0; // Illegal value by design
     }
 
     public interface IAgentPreferencesService
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 28c3315..170dc97 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="id"></param>
         /// <returns></returns>
         AssetMetadata GetMetadata(string id);
-        
+
         /// <summary>
         /// Get an asset's data, ignoring the metadata.
         /// </summary>
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Interfaces
         AssetBase GetCached(string id);
 
         /// <summary>
-        /// Get an asset synchronously or asynchronously (depending on whether 
+        /// Get an asset synchronously or asynchronously (depending on whether
         /// it is locally cached) and fire a callback with the fetched asset
         /// </summary>
         /// <param name="id">The asset id</param>
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces
         /// </param>
         /// <returns>True if the id was parseable, false otherwise</returns>
         bool Get(string id, Object sender, AssetRetrieved handler);
-        
+
         /// <summary>
         /// Check if assets exist in the database.
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/IAttachmentsService.cs b/OpenSim/Services/Interfaces/IAttachmentsService.cs
new file mode 100644
index 0000000..7d33662
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IAttachmentsService.cs
@@ -0,0 +1,38 @@
+/*
+ * 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 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 cee8bc0..1ff092f 100644
--- a/OpenSim/Services/Interfaces/IAuthenticationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Interfaces
     // Generic Authentication service used for identifying
     // and authenticating principals.
     // Principals may be clients acting on users' behalf,
-    // or any other components that need 
+    // or any other components that need
     // verifiable identification.
     //
     public interface IAuthenticationService
@@ -67,6 +67,7 @@ namespace OpenSim.Services.Interfaces
         // various services.
         //
         string Authenticate(UUID principalID, string password, int lifetime);
+        string Authenticate(UUID principalID, string password, int lifetime, out UUID realID);
 
         //////////////////////////////////////////////////////
         // Verification
diff --git a/OpenSim/Services/Interfaces/IAuthorizationService.cs b/OpenSim/Services/Interfaces/IAuthorizationService.cs
index e5c68f6..d4c697a 100644
--- a/OpenSim/Services/Interfaces/IAuthorizationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthorizationService.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework;
 namespace OpenSim.Services.Interfaces
 {
     // Generic Authorization service used for authorizing principals in a particular region
-    
+
     public interface IAuthorizationService
     {
         /// <summary>
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Interfaces
         bool IsAuthorizedForRegion(
             string userID, string firstName, string lastName, string regionID, out string message);
     }
-    
+
     public class AuthorizationRequest
     {
         private string m_userID;
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Interfaces
             m_userID = ID;
             m_regionID = RegionID;
         }
-        
+
         public AuthorizationRequest(
             string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID)
         {
@@ -80,44 +80,44 @@ namespace OpenSim.Services.Interfaces
             m_regionName = RegionName;
             m_regionID = RegionID;
         }
-        
+
         public string ID
         {
             get { return m_userID; }
             set { m_userID = value; }
         }
-        
+
         public string FirstName
         {
             get { return m_firstname; }
             set { m_firstname = value; }
         }
-        
+
         public string SurName
         {
             get { return m_surname; }
             set { m_surname = value; }
         }
-        
+
         public string Email
         {
             get { return m_email; }
             set { m_email = value; }
         }
-        
+
         public string RegionName
         {
             get { return m_regionName; }
             set { m_regionName = value; }
         }
-                        
+
         public string RegionID
         {
             get { return m_regionID; }
             set { m_regionID = value; }
         }
     }
-    
+
     public class AuthorizationResponse
     {
         private bool m_isAuthorized;
@@ -132,13 +132,13 @@ namespace OpenSim.Services.Interfaces
             m_isAuthorized = isAuthorized;
             m_message = message;
         }
-        
+
         public bool IsAuthorized
         {
             get { return m_isAuthorized; }
             set { m_isAuthorized = value; }
         }
-        
+
         public string Message
         {
             get { return m_message; }
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 892e0b4..b4dc511 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="appearance"></param>
         /// <returns></returns>
         bool SetAppearance(UUID userID, AvatarAppearance appearance);
-        
+
         /// <summary>
         /// Called by the login service
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces
         bool ResetAvatar(UUID userID);
 
         /// <summary>
-        /// These methods raison d'etre: 
+        /// These methods raison d'etre:
         /// No need to send the entire avatar data (SetAvatar) for changing attachments
         /// </summary>
         /// <param name="userID"></param>
@@ -150,7 +150,8 @@ namespace OpenSim.Services.Interfaces
             // Wearables
             Data["AvatarHeight"] = appearance.AvatarHeight.ToString();
 
-            for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++)
+            // TODO: With COF, is this even needed?
+            for (int i = 0 ; i < AvatarWearable.LEGACY_VERSION_MAX_WEARABLES ; i++)
             {
                 for (int j = 0 ; j < appearance.Wearables[i].Count ; j++)
                 {
@@ -211,8 +212,8 @@ namespace OpenSim.Services.Interfaces
                     float h = float.Parse(Data["AvatarHeight"]);
                     if( h == 0f)
                         h = 1.9f;
-                  
-                    appearance.AvatarHeight = h;
+                    appearance.SetSize(new Vector3(0.45f, 0.6f, h ));
+//                    appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
                 }
 
                 // Legacy Wearables
@@ -287,12 +288,11 @@ namespace OpenSim.Services.Interfaces
                     //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
 
                     //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
-                    
                     byte[] binary = new byte[vps.Length];
 
                     for (int i = 0; i < vps.Length; i++)
                         binary[i] = (byte)Convert.ToInt32(vps[i]);
-                    
+
                     appearance.VisualParams = binary;
                 }
 
@@ -357,6 +357,7 @@ namespace OpenSim.Services.Interfaces
                     appearance.Wearables[AvatarWearable.EYES].Wear(
                             AvatarWearable.DefaultWearables[
                             AvatarWearable.EYES][0]);
+
             }
             catch
             {
diff --git a/OpenSim/Services/Interfaces/IEstateDataService.cs b/OpenSim/Services/Interfaces/IEstateDataService.cs
index 719563d..9b64a39 100644
--- a/OpenSim/Services/Interfaces/IEstateDataService.cs
+++ b/OpenSim/Services/Interfaces/IEstateDataService.cs
@@ -39,14 +39,14 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="regionID"></param>
         /// <param name="create">If true, then an estate is created if one is not found.</param>
-        /// <returns></returns>        
+        /// <returns></returns>
         EstateSettings LoadEstateSettings(UUID regionID, bool create);
-        
+
         /// <summary>
         /// Load estate settings for an estate ID.
         /// </summary>
         /// <param name="estateID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         EstateSettings LoadEstateSettings(int estateID);
 
         /// <summary>
@@ -56,60 +56,60 @@ namespace OpenSim.Services.Interfaces
         /// A <see cref="EstateSettings"/>
         /// </returns>
         EstateSettings CreateNewEstate();
-        
+
         /// <summary>
         /// Load/Get all estate settings.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<EstateSettings> LoadEstateSettingsAll();
-        
+
         /// <summary>
         /// Store estate settings.
         /// </summary>
         /// <remarks>
         /// This is also called by EstateSettings.Save()</remarks>
-        /// <param name="es"></param>        
+        /// <param name="es"></param>
         void StoreEstateSettings(EstateSettings es);
-        
+
         /// <summary>
         /// Get estate IDs.
         /// </summary>
         /// <param name="search">Name of estate to search for.  This is the exact name, no parttern matching is done.</param>
-        /// <returns></returns>        
+        /// <returns></returns>
         List<int> GetEstates(string search);
-        
+
         /// <summary>
         /// Get the IDs of all estates owned by the given user.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
-        List<int> GetEstatesByOwner(UUID ownerID);        
-        
+        List<int> GetEstatesByOwner(UUID ownerID);
+
         /// <summary>
         /// Get the IDs of all estates.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<int> GetEstatesAll();
-            
+
         /// <summary>
         /// Link a region to an estate.
         /// </summary>
         /// <param name="regionID"></param>
         /// <param name="estateID"></param>
-        /// <returns>true if the link succeeded, false otherwise</returns>        
+        /// <returns>true if the link succeeded, false otherwise</returns>
         bool LinkRegion(UUID regionID, int estateID);
-        
+
         /// <summary>
         /// Get the UUIDs of all the regions in an estate.
         /// </summary>
         /// <param name="estateID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         List<UUID> GetRegions(int estateID);
-        
+
         /// <summary>
         /// Delete an estate
         /// </summary>
         /// <param name="estateID"></param>
-        /// <returns>true if the delete succeeded, false otherwise</returns>        
+        /// <returns>true if the delete succeeded, false otherwise</returns>
         bool DeleteEstate(int estateID);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index f5f1f75..ead5d3c 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Services.Interfaces
         GridRegion GetRegionByName(UUID scopeID, string regionName);
 
         /// <summary>
-        /// Get information about regions starting with the provided name. 
+        /// Get information about regions starting with the provided name.
         /// </summary>
         /// <param name="name">
         /// The name to match against.
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Interfaces
         /// </param>
         /// <returns>
         /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the
-        /// grid-server couldn't be contacted or returned an error, return null. 
+        /// grid-server couldn't be contacted or returned an error, return null.
         /// </returns>
         List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber);
 
@@ -139,7 +139,7 @@ namespace OpenSim.Services.Interfaces
 #pragma warning restore 414
 
         /// <summary>
-        /// The port by which http communication occurs with the region 
+        /// The port by which http communication occurs with the region
         /// </summary>
         public uint HttpPort { get; set; }
 
@@ -148,7 +148,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         public string ServerURI
         {
-            get { 
+            get {
                 if (!String.IsNullOrEmpty(m_serverURI)) {
                     return m_serverURI;
                 } else {
@@ -158,14 +158,25 @@ namespace OpenSim.Services.Interfaces
                         return "http://" + m_externalHostName + ":" + HttpPort + "/";
                 }
             }
-            set { 
-                if (value.EndsWith("/")) {
+            set {
+                if ( value == null)
+                {
+                    m_serverURI = String.Empty;
+                    return;
+                }
+
+                if ( value.EndsWith("/") )
+                {
+
                     m_serverURI = value;
-                } else {
+                }
+                else
+                {
                     m_serverURI = value + '/';
                 }
             }
         }
+
         protected string m_serverURI;
 
         /// <summary>
@@ -260,31 +271,6 @@ namespace OpenSim.Services.Interfaces
             m_serverURI = string.Empty;
         }
 
-        /*
-        public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri)
-        {
-            m_regionLocX = regionLocX;
-            m_regionLocY = regionLocY;
-            RegionSizeX = (int)Constants.RegionSize;
-            RegionSizeY = (int)Constants.RegionSize;
-
-            m_internalEndPoint = internalEndPoint;
-            m_externalHostName = externalUri;
-        }
-
-        public GridRegion(int regionLocX, int regionLocY, string externalUri, uint port)
-        {
-            m_regionLocX = regionLocX;
-            m_regionLocY = regionLocY;
-            RegionSizeX = (int)Constants.RegionSize;
-            RegionSizeY = (int)Constants.RegionSize;
-
-            m_externalHostName = externalUri;
-
-            m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)port);
-        }
-         */
-
         public GridRegion(uint xcell, uint ycell)
         {
             m_regionLocX = (int)Util.RegionToWorldLoc(xcell);
@@ -333,7 +319,7 @@ namespace OpenSim.Services.Interfaces
             RegionSecret = ConvertFrom.RegionSecret;
             EstateOwner = ConvertFrom.EstateOwner;
         }
-                
+
         public GridRegion(Dictionary<string, object> kvp)
         {
             if (kvp.ContainsKey("uuid"))
@@ -358,6 +344,13 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("regionName"))
                 RegionName = (string)kvp["regionName"];
 
+            if (kvp.ContainsKey("access"))
+            {
+                byte access = Convert.ToByte((string)kvp["access"]);
+                Access = access;
+                Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
+            }
+
             if (kvp.ContainsKey("flags") && kvp["flags"] != null)
                 RegionFlags = (OpenSim.Framework.RegionFlags?)Convert.ToInt32((string)kvp["flags"]);
 
@@ -394,9 +387,6 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("parcelMapTexture"))
                 UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
 
-            if (kvp.ContainsKey("access"))
-                Access = Byte.Parse((string)kvp["access"]);
-
             if (kvp.ContainsKey("regionSecret"))
                 RegionSecret =(string)kvp["regionSecret"];
 
@@ -409,7 +399,7 @@ namespace OpenSim.Services.Interfaces
             // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
             //                         LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
         }
-                
+
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> kvp = new Dictionary<string, object>();
@@ -472,41 +462,7 @@ namespace OpenSim.Services.Interfaces
         /// </value>
         public IPEndPoint ExternalEndPoint
         {
-            get
-            {
-                // Old one defaults to IPv6
-                //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port);
-
-                IPAddress ia = null;
-                // If it is already an IP, don't resolve it - just return directly
-                if (IPAddress.TryParse(m_externalHostName, out ia))
-                    return new IPEndPoint(ia, m_internalEndPoint.Port);
-
-                // Reset for next check
-                ia = null;
-                try
-                {
-                    foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
-                    {
-                        if (ia == null)
-                            ia = Adr;
-
-                        if (Adr.AddressFamily == AddressFamily.InterNetwork)
-                        {
-                            ia = Adr;
-                            break;
-                        }
-                    }
-                }
-                catch (SocketException e)
-                {
-                    throw new Exception(
-                        "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
-                        e + "' attached to this exception", e);
-                }
-
-                return new IPEndPoint(ia, m_internalEndPoint.Port);
-            }
+            get { return Util.getEndPoint(m_externalHostName, m_internalEndPoint.Port); }
         }
 
         public string ExternalHostName
@@ -526,4 +482,4 @@ namespace OpenSim.Services.Interfaces
             get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 2e7237e..6ad0f42 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Services.Interfaces
     public class GridUserInfo
     {
         public string UserID;
-        
+
         public UUID HomeRegionID;
         public Vector3 HomePosition;
         public Vector3 HomeLookAt;
@@ -45,13 +45,13 @@ namespace OpenSim.Services.Interfaces
         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"))
@@ -96,11 +96,11 @@ namespace OpenSim.Services.Interfaces
             result["Online"] = Online.ToString();
             result["Login"] = Login.ToString();
             result["Logout"] = Logout.ToString();
-            
+
             return result;
         }
     }
-    
+
     public interface IGridUserService
     {
         GridUserInfo LoggedIn(string userID);
@@ -115,7 +115,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="lastLookAt">Last normalized look direction for the user</param>
         /// <returns>True if the logout request was successfully processed, otherwise false</returns>
         bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
-        
+
         bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt);
 
         /// <summary>
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="lastLookAt">Normalized look direction</param>
         /// <returns>True if the user's last position was successfully updated, otherwise false</returns>
         bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
-        
+
         GridUserInfo GetGridUserInfo(string userID);
         GridUserInfo[] GetGridUserInfo(string[] userID);
     }
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index 5e012fb..e0a63ca 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -36,8 +36,8 @@ 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);
-        
+        bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY);
+
         /// <summary>
         /// Returns the region a Hypergrid visitor should enter.
         /// </summary>
@@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces
     public interface IUserAgentService
     {
         bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);
-        
+
         void LogoutAgent(UUID userID, UUID sessionID);
 
         /// <summary>
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Interfaces
         /// <returns>On success: the user's Server URLs. If the user doesn't exist: "".</returns>
         /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks>
         string LocateUser(UUID userID);
-        
+
         /// <summary>
         /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'.
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index 4289bba..582ea90 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="folderIDs"></param>
         /// <returns>Inventory content.</returns>
         InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs);
-        
+
         /// <summary>
         /// Gets the items inside a folder
         /// </summary>
@@ -161,7 +161,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="item"></param>
         /// <returns>null if no item was found, otherwise the found item</returns>
-        InventoryItemBase GetItem(InventoryItemBase item);
+        InventoryItemBase GetItem(UUID userID, UUID itemID);
 
         /// <summary>
         /// Get multiple items, given by their UUIDs
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="folder"></param>
         /// <returns></returns>
-        InventoryFolderBase GetFolder(InventoryFolderBase folder);
+        InventoryFolderBase GetFolder(UUID userID, UUID folderID);
 
         /// <summary>
         /// Does the given user have an inventory structure?
@@ -193,11 +193,11 @@ namespace OpenSim.Services.Interfaces
 
         /// <summary>
         /// Get the union of permissions of all inventory items
-        /// that hold the given assetID. 
+        /// that hold the given assetID.
         /// </summary>
         /// <param name="userID"></param>
         /// <param name="assetID"></param>
-        /// <returns>The permissions or 0 if no such asset is found in 
+        /// <returns>The permissions or 0 if no such asset is found in
         /// the user's inventory</returns>
         int GetAssetPermissions(UUID userID, UUID assetID);
     }
diff --git a/OpenSim/Services/Interfaces/ILoginService.cs b/OpenSim/Services/Interfaces/ILoginService.cs
index ee9b0b1..7c44cd8 100644
--- a/OpenSim/Services/Interfaces/ILoginService.cs
+++ b/OpenSim/Services/Interfaces/ILoginService.cs
@@ -47,8 +47,8 @@ namespace OpenSim.Services.Interfaces
 
     public interface ILoginService
     {
-        LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, 
-            string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP);
+        LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
+            string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient);
         Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP);
     }
 
diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs
index 78daa5f..b8d45dd 100644
--- a/OpenSim/Services/Interfaces/IMapImageService.cs
+++ b/OpenSim/Services/Interfaces/IMapImageService.cs
@@ -34,8 +34,8 @@ namespace OpenSim.Services.Interfaces
     public interface IMapImageService
     {
         //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
-        bool AddMapTile(int x, int y, byte[] imageData, out string reason);
-        bool RemoveMapTile(int x, int y, out string reason);
-        byte[] GetMapTile(string fileName, out string format);
+        bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
+        bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
+        byte[] GetMapTile(string fileName, UUID scopeID, out string format);
     }
 }
diff --git a/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCourseLocation.cs b/OpenSim/Services/Interfaces/IMuteLIstService.cs
index 224ac99..9ffd47f 100644
--- a/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCourseLocation.cs
+++ b/OpenSim/Services/Interfaces/IMuteLIstService.cs
@@ -27,17 +27,15 @@
 
 using System;
 using System.Collections.Generic;
-using OpenMetaverse;
 using OpenSim.Framework;
+using OpenMetaverse;
 
-namespace OpenSim.Region.RegionCombinerModule
+namespace OpenSim.Services.Interfaces
 {
-
-    struct RegionCoarseLocationStruct
+    public interface  IMuteListService
     {
-        public List<Vector3> Locations;
-        public List<UUID> Uuids;
-        public IClientAPI UserAPI;
-        public Vector2 Offset;
+        Byte[] MuteListRequest(UUID agent, uint crc);
+        bool UpdateMute(MuteData mute);
+        bool RemoveMute(UUID agentID, UUID muteID, string muteName);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/IOfflineIMService.cs b/OpenSim/Services/Interfaces/IOfflineIMService.cs
index 588aaaf..db501fd 100644
--- a/OpenSim/Services/Interfaces/IOfflineIMService.cs
+++ b/OpenSim/Services/Interfaces/IOfflineIMService.cs
@@ -35,9 +35,9 @@ namespace OpenSim.Services.Interfaces
     public interface IOfflineIMService
     {
         List<GridInstantMessage> GetMessages(UUID principalID);
-        
+
         bool StoreMessage(GridInstantMessage im, out string reason);
-        
+
         /// <summary>
         /// Delete messages to or from this user (or group).
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 8a25509..a01897a 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -34,20 +34,6 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Services.Interfaces
 {
-    public class EntityTransferContext
-    {
-        public EntityTransferContext()
-        {
-            InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
-            OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax;
-            VariableWearablesSupported = false;
-        }
-
-        public float InboundVersion { get; set; }
-        public float OutboundVersion { get; set; }
-        public bool VariableWearablesSupported { get; set; }
-    }
-
     public interface ISimulationService
     {
         /// <summary>
@@ -73,8 +59,8 @@ namespace OpenSim.Services.Interfaces
         /// <param name="destination"></param>
         /// <param name="aCircuit"></param>
         /// <param name="flags"></param>
-        /// <param name="reason">Reason message in the event of a failure.</param>        
-        bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason);
+        /// <param name="reason">Reason message in the event of a failure.</param>
+        bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason);
 
         /// <summary>
         /// Full child agent update.
@@ -82,7 +68,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="regionHandle"></param>
         /// <param name="data"></param>
         /// <returns></returns>
-        bool UpdateAgent(GridRegion destination, AgentData data);
+        bool UpdateAgent(GridRegion destination, AgentData data, EntityTransferContext ctx);
 
         /// <summary>
         /// Short child agent update, mostly for position.
@@ -100,6 +86,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param>
         /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param>
         /// <param name="position">Position in the region</param>
+
         /// <param name="sversion">
         /// Version that the requesting simulator is runing.  If null then no version check is carried out.
         /// </param>
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 2f7702c..c6f3ef3 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -91,6 +91,7 @@ namespace OpenSim.Services.Interfaces
         public int UserLevel;
         public int UserFlags;
         public string UserTitle;
+        public string UserCountry;
         public Boolean LocalToGrid = true;
 
         public Dictionary<string, object> ServiceURLs;
@@ -120,6 +121,8 @@ namespace OpenSim.Services.Interfaces
                 UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString());
             if (kvp.ContainsKey("UserTitle"))
                 UserTitle = kvp["UserTitle"].ToString();
+            if (kvp.ContainsKey("UserCountry"))
+                UserCountry = kvp["UserCountry"].ToString();
             if (kvp.ContainsKey("LocalToGrid"))
                 Boolean.TryParse(kvp["LocalToGrid"].ToString(), out LocalToGrid);
 
@@ -155,6 +158,7 @@ namespace OpenSim.Services.Interfaces
             result["UserLevel"] = UserLevel.ToString();
             result["UserFlags"] = UserFlags.ToString();
             result["UserTitle"] = UserTitle;
+            result["UserCountry"] = UserCountry;
             result["LocalToGrid"] = LocalToGrid.ToString();
 
             string str = string.Empty;
@@ -182,6 +186,8 @@ namespace OpenSim.Services.Interfaces
         /// <param name="query"></param>
         /// <returns></returns>
         List<UserAccount> GetUserAccounts(UUID scopeID, string query);
+        List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where);
+        List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs);
 
         /// <summary>
         /// Store the data given, wich replaces the stored data, therefore must be complete.
diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs
index 9e560d5..91b344e 100644
--- a/OpenSim/Services/Interfaces/IUserManagement.cs
+++ b/OpenSim/Services/Interfaces/IUserManagement.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Services.Interfaces
         string GetUserUUI(UUID uuid);
         bool GetUserUUI(UUID userID, out string uui);
         string GetUserServerURL(UUID uuid, string serverType);
+        Dictionary<UUID,string> GetUsersNames(string[] ids);
 
         /// <summary>
         /// Get user ID by the given name.
@@ -78,7 +79,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="uuid"></param>
         /// <param name="firstName"></param>
         /// <param name="lastName"></param>
-        void AddUser(UUID uuid, string firstName, string lastName);
+        void AddUser(UUID uuid, string first, string last, bool isNPC = false);
 
         /// <summary>
         /// Add a user.
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 121baa8..867c623 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -40,19 +40,19 @@ namespace OpenSim.Services.Interfaces
         bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result);
         bool ClassifiedDelete(UUID recordId);
         #endregion Classifieds
-        
+
         #region Picks
         OSD AvatarPicksRequest(UUID creatorId);
         bool PickInfoRequest(ref UserProfilePick pick, ref string result);
         bool PicksUpdate(ref UserProfilePick pick, ref string result);
         bool PicksDelete(UUID pickId);
         #endregion Picks
-        
+
         #region Notes
         bool AvatarNotesRequest(ref UserProfileNotes note);
         bool NotesUpdate(ref UserProfileNotes note, ref string result);
         #endregion Notes
-        
+
         #region Profile Properties
         bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
         bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
@@ -62,7 +62,7 @@ namespace OpenSim.Services.Interfaces
         bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
         bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
         #endregion User Preferences
-        
+
         #region Interests
         bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
         #endregion Interests
diff --git a/OpenSim/Services/Interfaces/OpenProfileClient.cs b/OpenSim/Services/Interfaces/OpenProfileClient.cs
index bda8151..8c4d14b 100644
--- a/OpenSim/Services/Interfaces/OpenProfileClient.cs
+++ b/OpenSim/Services/Interfaces/OpenProfileClient.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Services.UserProfilesService
     public class OpenProfileClient
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private string m_serverURI;
 
         /// <summary>
@@ -60,7 +60,7 @@ namespace OpenSim.Services.UserProfilesService
         {
             m_serverURI = serverURI;
         }
-               
+
         /// <summary>
         /// Gets an avatar's profile using the OpenProfile protocol.
         /// </summary>
diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
index 01cafbf..6c683b4 100644
--- a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Services.Interfaces")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.*")]
+[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]