Merge branch 'master' into varregion

Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

4 files changed, 81 insertions, 4 deletions

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index df2b4d7..d4708b7 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -177,6 +177,7 @@ namespace OpenSim.Services.Interfaces
 
         /// <summary>
         /// The location of this region in meters.
+        /// DANGER DANGER! Note that this name means something different in RegionInfo.
         /// </summary>
         public int RegionLocX
         {
@@ -189,7 +190,8 @@ namespace OpenSim.Services.Interfaces
         public int RegionSizeY { get; set; }
 
         /// <summary>
-        /// The location of this region in meters.
+        /// The location of this region in meters.

+        /// DANGER DANGER! Note that this name means something different in RegionInfo.
         /// </summary>
         public int RegionLocY
         {
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index f9e7f08..05e175a 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -43,9 +43,6 @@ namespace OpenSim.Services.Interfaces
 
     }
 
-    /// <summary>
-    /// HG1.5 only
-    /// </summary>
     public interface IUserAgentService
     {
         bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 319d307..121baa8 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -57,6 +57,11 @@ namespace OpenSim.Services.Interfaces
         bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
         bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
         #endregion Profile Properties
+
+        #region User Preferences
+        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);
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index d00f34d..dd26cdc 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -37,6 +37,7 @@ using OpenSim.Data;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
+using OpenSim.Services.UserAccountService;
 
 namespace OpenSim.Services.ProfilesService
 {
@@ -163,6 +164,78 @@ namespace OpenSim.Services.ProfilesService
         }
         #endregion Interests
 
+        #region User Preferences
+        public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
+        {
+            if(string.IsNullOrEmpty(pref.EMail))
+            {
+                UserAccount account = new UserAccount();
+                if(userAccounts is UserAccountService.UserAccountService)
+                {
+                    try
+                    {
+                        account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
+                        if(string.IsNullOrEmpty(account.Email))
+                        {
+                            result = "No Email address on record!";
+                            return false;
+                        }
+                        else
+                            pref.EMail = account.Email;
+                    }
+                    catch
+                    {
+                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
+                        result = "Missing Email address!";
+                        return false;
+                    }
+                }
+                else
+                {
+                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
+                    result = "Missing Email address!";
+                    return false;
+                }
+            }
+            return ProfilesData.UpdateUserPreferences(ref pref, ref result);
+        }
+
+        public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
+        {
+            if(string.IsNullOrEmpty(pref.EMail))
+            {
+                UserAccount account = new UserAccount();
+                if(userAccounts is UserAccountService.UserAccountService)
+                {
+                    try
+                    {
+                        account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
+                        if(string.IsNullOrEmpty(account.Email))
+                        {
+                            result = "No Email address on record!";
+                            return false;
+                        }
+                        else
+                            pref.EMail = account.Email;
+                    }
+                    catch
+                    {
+                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
+                        result = "Missing Email address!";
+                        return false;
+                    }
+                }
+                else
+                {
+                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
+                    result = "Missing Email address!";
+                    return false;
+                }
+            }
+            return ProfilesData.GetUserPreferences(ref pref, ref result);
+        }
+        #endregion User Preferences
+
         #region Utility
         public OSD AvatarImageAssetsRequest(UUID avatarId)
         {