Merge branch 'master' into vehicles

17 files changed, 71 insertions, 202 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 238810a..aa71536 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Communications.Cache
     /// Stores user profile and inventory data received from backend services for a particular user.
     /// </summary>
     public class CachedUserInfo
-    {        
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         //// <value>
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications.Cache
                             resolvedFolders.Add(folder);
                             resolvedFolderDictionary[folder.ID] = folder;
                             parentFolder.AddChildFolder(folder);
-                        }                            
+                        }
                     }
                 } // foreach (folder in pendingCategorizationFolders[parentFolder.ID])
 
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// <summary>
         /// Fetch inventory for this user.
         /// </summary>
-        /// This has to be executed as a separate step once user information is retreived.  
+        /// This has to be executed as a separate step once user information is retreived.
         /// This will occur synchronously if the inventory service is in the same process as this class, and
         /// asynchronously otherwise.
         public void FetchInventory()
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Communications.Cache
         ///
         /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
         /// so this will work to rename an existing folder.  Needless to say, to rely on this is very confusing,
-        /// and needs to be changed.        
+        /// and needs to be changed.
         ///
         /// <param name="folderID"></param>
         /// <param name="type"></param>
@@ -500,7 +500,7 @@ namespace OpenSim.Framework.Communications.Cache
                     InventoryFolderImpl oldParentFolder = RootFolder.FindFolder(folder.ParentID);
 
                     if (oldParentFolder != null)
-                    {                        
+                    {
                         oldParentFolder.RemoveChildFolder(folderID);
                         parentFolder.AddChildFolder(folder);
                     }
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 7f1c7e9..9e12d948 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// User profiles indexed by name
         /// </summary>
         private readonly Dictionary<string, CachedUserInfo> m_userProfilesByName 
-            = new Dictionary<string, CachedUserInfo>();        
+            = new Dictionary<string, CachedUserInfo>();
         
         /// <summary>
         /// The root library folder.
@@ -123,35 +123,35 @@ namespace OpenSim.Framework.Communications.Cache
         /// <summary>
         /// Get details of the given user.
         /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.  
+        /// If the user isn't in cache then the user is requested from the profile service.
         /// <param name="userID"></param>
-        /// <returns>null if no user details are found</returns>        
+        /// <returns>null if no user details are found</returns>
         public CachedUserInfo GetUserDetails(string fname, string lname)
         {
             lock (m_userProfilesByName)
-            {    
+            {
                 CachedUserInfo userInfo;
                 
-                if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))                    
+                if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))
                 {
                     return userInfo;
-                }                
+                }
                 else
-                {                
+                {
                     UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname);
                 
                     if (userProfile != null)
-                        return AddToCaches(userProfile);             
+                        return AddToCaches(userProfile);
                     else
                         return null;
-                }               
+                }
             }
         }
         
         /// <summary>
         /// Get details of the given user.
         /// </summary>
-        /// If the user isn't in cache then the user is requested from the profile service.  
+        /// If the user isn't in cache then the user is requested from the profile service.
         /// <param name="userID"></param>
         /// <returns>null if no user details are found</returns>
         public CachedUserInfo GetUserDetails(UUID userID)
@@ -185,20 +185,20 @@ namespace OpenSim.Framework.Communications.Cache
         // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
         // returning a read only class from the cache).
 //        public bool StoreProfile(UserProfileData userProfile)
-//        {            
+//        {
 //            lock (m_userProfilesById)
-//            {            
+//            {
 //                CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
-//                
+//
 //                if (userInfo != null)
 //                {
-//                    userInfo.m_userProfile = userProfile;                   
+//                    userInfo.m_userProfile = userProfile;
 //                    m_commsManager.UserService.UpdateUserProfile(userProfile);
-//                    
+//
 //                    return true;
 //                }
 //            }
-//            
+//
 //            return false;
 //        }
         
@@ -220,7 +220,7 @@ namespace OpenSim.Framework.Communications.Cache
                 }
             }
             
-            return createdUserInfo;            
+            return createdUserInfo;
         }
         
         /// <summary>
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 if (m_userProfilesById.ContainsKey(userId))
                 {
-                    CachedUserInfo userInfo = m_userProfilesById[userId];                    
+                    CachedUserInfo userInfo = m_userProfilesById[userId];
                     m_userProfilesById.Remove(userId);
                     
                     lock (m_userProfilesByName)
@@ -244,7 +244,7 @@ namespace OpenSim.Framework.Communications.Cache
                     
                     return true;
                 }
-            }        
+            }
             
             return false;
         }
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index 73e2db0..3419ce2 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -35,6 +35,8 @@ using System.Text;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
 using log4net;
 
 namespace OpenSim.Framework.Communications.Clients
@@ -43,7 +45,7 @@ namespace OpenSim.Framework.Communications.Clients
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public bool DoCreateChildAgentCall(RegionInfo region, AgentCircuitData aCircuit, string authKey, out string reason)
+        public bool DoCreateChildAgentCall(GridRegion region, AgentCircuitData aCircuit, string authKey, out string reason)
         {
             reason = String.Empty;
 
@@ -166,7 +168,7 @@ namespace OpenSim.Framework.Communications.Clients
 
         }
 
-        public bool DoChildAgentUpdateCall(RegionInfo region, IAgentData cAgentData)
+        public bool DoChildAgentUpdateCall(GridRegion region, IAgentData cAgentData)
         {
             // Eventually, we want to use a caps url instead of the agentID
             string uri = string.Empty;
@@ -260,7 +262,7 @@ namespace OpenSim.Framework.Communications.Clients
             return true;
         }
 
-        public bool DoRetrieveRootAgentCall(RegionInfo region, UUID id, out IAgentData agent)
+        public bool DoRetrieveRootAgentCall(GridRegion region, UUID id, out IAgentData agent)
         {
             agent = null;
             // Eventually, we want to use a caps url instead of the agentID
@@ -348,7 +350,7 @@ namespace OpenSim.Framework.Communications.Clients
         }
 
 
-        public bool DoCloseAgentCall(RegionInfo region, UUID id)
+        public bool DoCloseAgentCall(GridRegion region, UUID id)
         {
             string uri = string.Empty;
             try
@@ -391,7 +393,7 @@ namespace OpenSim.Framework.Communications.Clients
             return true;
         }
 
-        public bool DoCreateObjectCall(RegionInfo region, ISceneObject sog, string sogXml2, bool allowScriptCrossing)
+        public bool DoCreateObjectCall(GridRegion region, ISceneObject sog, string sogXml2, bool allowScriptCrossing)
         {
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
             string uri 
@@ -474,7 +476,7 @@ namespace OpenSim.Framework.Communications.Clients
 
         }
 
-        public bool DoCreateObjectCall(RegionInfo region, UUID userID, UUID itemID)
+        public bool DoCreateObjectCall(GridRegion region, UUID userID, UUID itemID)
         {
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
             string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + UUID.Zero + "/" + regionHandle.ToString() + "/";
@@ -646,7 +648,7 @@ namespace OpenSim.Framework.Communications.Clients
             return false;
         }
 
-        public virtual void SendUserInformation(RegionInfo regInfo, AgentCircuitData aCircuit)
+        public virtual void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit)
         {
         }
 
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index e9a6adb..2410f31 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -59,11 +59,6 @@ namespace OpenSim.Framework.Communications
         }
         protected IMessagingService m_messageService;
 
-        public IGridServices GridService
-        {
-            get { return m_gridService; }
-        }
-        protected IGridServices m_gridService;
 
         public UserProfileCacheService UserProfileCacheService
         {
@@ -95,8 +90,8 @@ namespace OpenSim.Framework.Communications
         public IUserAdminService UserAdminService
         {
             get { return m_userAdminService; }
-        }        
-        protected IUserAdminService m_userAdminService;        
+        }
+        protected IUserAdminService m_userAdminService;
 
         /// <summary>
         /// Constructor
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index 4afc58f..760aa62 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Communications
         /// Update avatar appearance information
         /// </summary>
         /// <param name="user"></param>
-        /// <param name="appearance"></param>        
+        /// <param name="appearance"></param>
         void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
     }
 }
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
deleted file mode 100644
index 6365919..0000000
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ /dev/null
@@ -1,92 +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.Framework.Communications
-{
-    public interface IGridServices
-    {
-        string gdebugRegionName { get; set; }
-        
-        /// <summary>
-        /// If true, then regions will accept logins from the user service.  If false, then they will not.
-        /// </summary>
-        bool RegionLoginsEnabled { get; set; }
-
-        /// <summary>
-        /// Register a region with the grid service.
-        /// </summary>
-        /// <param name="regionInfos"> </param>
-        /// <returns></returns>
-        /// <exception cref="System.Exception">Thrown if region registration failed</exception>
-        RegionCommsListener RegisterRegion(RegionInfo regionInfos);
-
-        /// <summary>
-        /// Deregister a region with the grid service.
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        /// <exception cref="System.Exception">Thrown if region deregistration failed</exception>
-        bool DeregisterRegion(RegionInfo regionInfo);   
-
-        /// <summary>
-        /// Get information about the regions neighbouring the given co-ordinates.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns></returns>
-        List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
-
-        RegionInfo RequestNeighbourInfo(ulong regionHandle);
-        RegionInfo RequestNeighbourInfo(UUID regionID);
-        RegionInfo RequestNeighbourInfo(string name);
-        RegionInfo RequestNeighbourInfo(string host, uint port);
-
-        RegionInfo RequestClosestRegion(string regionName);
-        Dictionary<string, string> GetGridSettings();
-        List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
-        // not complete yet, only contains the fields needed for ParcelInfoReqeust
-        LandData RequestLandData(ulong regionHandle, uint x, uint y);
-
-        /// <summary>
-        /// Get information about regions starting with the provided name. 
-        /// </summary>
-        /// <param name="name">
-        /// The name to match against.
-        /// </param>
-        /// <param name="maxNumber">
-        /// The maximum number of results to return.
-        /// </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. 
-        /// </returns>
-        List<RegionInfo> RequestNamedRegions(string name, int maxNumber);
-    }
-}
diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs
deleted file mode 100644
index 5057386..0000000
--- a/OpenSim/Framework/Communications/IHyperlink.cs
+++ /dev/null
@@ -1,38 +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.
- */
-
-namespace OpenSim.Framework.Communications
-{
-    public interface IHyperlink
-    {
-        bool IsHyperlinkRegion(ulong handle);
-        RegionInfo GetHyperlinkRegion(ulong handle);
-        ulong FindRegionHandle(ulong handle);
-        bool SendUserInformation(RegionInfo region, AgentCircuitData aCircuit);
-        void AdjustUserInformation(AgentCircuitData aCircuit);
-    }
-}
diff --git a/OpenSim/Framework/Communications/IUserAdminService.cs b/OpenSim/Framework/Communications/IUserAdminService.cs
index 15b989d..423b49b 100644
--- a/OpenSim/Framework/Communications/IUserAdminService.cs
+++ b/OpenSim/Framework/Communications/IUserAdminService.cs
@@ -66,6 +66,6 @@ namespace OpenSim.Framework.Communications
         /// <param name="lastName"></param>
         /// <param name="newPassword"></param>
         /// <returns>true if the update was successful, false otherwise</returns>
-        bool ResetUserPassword(string firstName, string lastName, string newPassword);        
+        bool ResetUserPassword(string firstName, string lastName, string newPassword);
     }
 }
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 15c5a96..dfa059d 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Communications
         /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
         /// <param name="friend">The agent that is getting or loosing permissions</param>
         /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
-        void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);   
+        void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
 
         /// <summary>
         /// Logs off a user on the user server
@@ -128,9 +128,9 @@ namespace OpenSim.Framework.Communications
         /// 
         /// <param name="friendlistowner">The agent for whom we're retreiving the friends Data.</param>
         /// <returns>
-        /// A List of FriendListItems that contains info about the user's friends.  
+        /// A List of FriendListItems that contains info about the user's friends.
         /// Always returns a list even if the user has no friends
-        /// </returns>        
+        /// </returns>
         List<FriendListItem> GetUserFriendList(UUID friendlistowner);
 
         // This probably shouldn't be here, it belongs to IAuthentication
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Communications
         /// <param name="userID"></param>
         /// <param name="password"></param>
         /// <returns></returns>
-        bool AuthenticateUserByPassword(UUID userID, string password);        
+        bool AuthenticateUserByPassword(UUID userID, string password);
 
         // Temporary Hack until we move everything to the new service model
         void SetInventoryService(IInventoryService invService);
diff --git a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
index 98d0e0f..e96c5e8 100644
--- a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
+++ b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Osp
             
         public string Name { get { return "OspInventoryWrapperPlugin"; } }
         public string Version { get { return "0.1"; } }
-        public void Initialise() {}       
+        public void Initialise() {}
         public void Initialise(string connect) {}
         public void Dispose() {}
 
@@ -80,9 +80,9 @@ namespace OpenSim.Framework.Communications.Osp
         }
 
         protected InventoryItemBase PostProcessItem(InventoryItemBase item)
-        {            
+        {
             item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_commsManager);
-            return item;            
+            return item;
         }
         
         public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) { return m_wrappedPlugin.getFolderHierarchy(parentID); }
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index e98317a..32f0efc 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -33,13 +33,13 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Framework.Communications.Osp
-{    
+{
     /// <summary>
     /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for 
     /// identifying user profiles or supplying a simple name if no profile is available.
     /// </summary>
     public class OspResolver
-    {   
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         public const string OSPA_PREFIX = "ospa:";
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Osp
         {
             return 
                 OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
-        }        
+        }
         
         /// <summary>
         /// Resolve an osp string into the most suitable internal OpenSim identifier.
@@ -89,13 +89,13 @@ namespace OpenSim.Framework.Communications.Osp
         /// is returned.
         /// </returns>
         public static UUID ResolveOspa(string ospa, CommunicationsManager commsManager)
-        {                       
+        {
             if (!ospa.StartsWith(OSPA_PREFIX))
                 return UUID.Zero;
 
             m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
             
-            string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);            
+            string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
             string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
             
             foreach (string tuple in ospaTuples)
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Communications.Osp
             tempUserProfile.ID = HashName(tempUserProfile.Name);
             
             m_log.DebugFormat(
-                "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);            
+                "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);
             commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
             
             return tempUserProfile.ID;
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index a6cd918..922cd49 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -1072,7 +1072,7 @@ namespace OpenSim.Framework.Communications.Services
         /// <param name="user"></param>
         /// <param name="response"></param>
         /// <param name="remoteClient"></param>
-        /// <returns>true if the region was successfully contacted, false otherwise</returns>        
+        /// <returns>true if the region was successfully contacted, false otherwise</returns>
         protected abstract bool PrepareLoginToRegion(
             RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint client);
 
diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
index 43f1440..2413055 100644
--- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
+++ b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
 using OpenSim.Data;
 
 namespace OpenSim.Framework.Communications
-{                
+{
     /// <summary>
-    /// Plugin for managing temporary user profiles.  
+    /// Plugin for managing temporary user profiles.
     /// </summary>
     public class TemporaryUserProfilePlugin : IUserDataPlugin
     {
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications
         
         public string Name { get { return "TemporaryUserProfilePlugin"; } }
         public string Version { get { return "0.1"; } }
-        public void Initialise() {}       
+        public void Initialise() {}
         public void Initialise(string connect) {}
         public void Dispose() {}
         
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
index a757282..caaebd7 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -152,8 +152,8 @@ namespace OpenSim.Framework.Communications.Tests
 
             public virtual bool AuthenticateUserByPassword(UUID userID, string password)
             {
-                throw new NotImplementedException();        
-            }             
+                throw new NotImplementedException();
+            }
         }
     }
 }
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index e5d8895..830c877 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Communications.Tests
 
             timedOut = true;
             lock (this)
-            {                   
+            {
                 UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
              }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
             
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -271,7 +271,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo userInfo;
 
             lock (this)
-            {                   
+            {
                 userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived);
                 Monitor.Wait(this, 60000);
             }
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 0a9d2ae..e891d9c 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -318,7 +318,7 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestHelper.InMethod();
 
-            //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");            
+            //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");
             //log4net.Config.XmlConfigurator.Configure();
             
             string error_already_logged = "You appear to be already logged in. " +
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 1abd733..bf4f331 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -94,9 +94,9 @@ namespace OpenSim.Framework.Communications
         public void AddPlugin(string provider, string connect)
         {
             m_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IUserDataPlugin>(provider, connect));
-        }       
+        }
 
-        #region UserProfile        
+        #region UserProfile
         
         public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
         {
@@ -650,15 +650,17 @@ namespace OpenSim.Framework.Communications
         public virtual UUID AddUser(
             string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID)
         {
-            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
 
             UserProfileData user = new UserProfileData();
+
+            user.PasswordSalt = Util.Md5Hash(UUID.Random().ToString());
+            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + user.PasswordSalt);
+
             user.HomeLocation = new Vector3(128, 128, 100);
             user.ID = SetUUID;
             user.FirstName = firstName;
             user.SurName = lastName;
             user.PasswordHash = md5PasswdHash;
-            user.PasswordSalt = String.Empty;
             user.Created = Util.UnixTimeSinceEpoch();
             user.HomeLookAt = new Vector3(100, 100, 100);
             user.HomeRegionX = regX;
@@ -922,8 +924,8 @@ namespace OpenSim.Framework.Communications
             if (md5PasswordHash == userProfile.PasswordHash)
                 return true;
             else
-                return false;         
-        }          
+                return false;
+        }
 
         #endregion
     }