Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: John Hurliman 2009-09-30 15:28:23 -0700
committer: John Hurliman 2009-09-30 15:28:23 -0700
commit: acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch)
tree: 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Framework
parent: * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff)
parent: Formatting cleanup. (diff)
download: opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip
opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz
opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2
opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz
63 files changed, 741 insertions, 915 deletions
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 5071594..4a5253c 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
                
                // Body
                defaultWearables[0].ItemID  = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
-                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");                
+                defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
                // Skin
                defaultWearables[1].ItemID  = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs
index 46dbd3d..0334e4b 100644
--- a/OpenSim/Framework/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 namespace OpenSim.Framework.Capabilities
-{    
+{
    /// <summary>
    /// Capabilities utility methods
    /// </summary>
diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs
index 81b1d9e..3df86d0 100644
--- a/OpenSim/Framework/Client/IClientIM.cs
+++ b/OpenSim/Framework/Client/IClientIM.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Client
    // Porting Guide from old IM
    // SendIM(...)
    //      Loses FromAgentSession - this should be added by implementers manually.
-    //      
+    //
    public interface IClientIM
    {
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index db532e0..094a3ff 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -177,9 +177,9 @@ namespace OpenSim.Framework
        }
        public void ViewerEffectHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args)
-        {            
+        {
            // TODO: don't create new blocks if recycling an old packet
-            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();                        
+            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();
            for (int i = 0; i < args.Count; i++)
            {
                ViewerEffectPacket.EffectBlock effect = new ViewerEffectPacket.EffectBlock();
diff --git a/OpenSim/Framework/CnmMemoryCache.cs b/OpenSim/Framework/CnmMemoryCache.cs
index db91801..92af331 100644
--- a/OpenSim/Framework/CnmMemoryCache.cs
+++ b/OpenSim/Framework/CnmMemoryCache.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
        /// <summary>
        /// How many operations between time checks.
-        /// </summary>        
+        /// </summary>
        private const int DefaultOperationsBetweenTimeChecks = 40;
        /// <summary>
@@ -168,7 +168,7 @@ namespace OpenSim.Framework
        private int m_version;
        /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.         
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
        /// </summary>
        public CnmMemoryCache()
            : this(DefaultMaxSize)
@@ -277,7 +277,7 @@ namespace OpenSim.Framework
        /// </param>
        protected virtual void AddToNewGeneration(int bucketIndex, TKey key, TValue value, long size)
        {
-            // Add to newest generation    
+            // Add to newest generation
            if (!m_newGeneration.Set(bucketIndex, key, value, size))
            {
                // Failed to add new generation
@@ -311,7 +311,7 @@ namespace OpenSim.Framework
        /// Bucket index is remainder when element key's hash value is divided by bucket count.
        /// </para>
        /// <para>
-        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.        
+        /// For example: key's hash is 72, bucket count is 5, element's bucket index is 72 % 5 = 2.
        /// </para>
        /// </remarks>
        protected virtual int GetBucketIndex(TKey key)
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
        /// </summary>
        private void RecycleGenerations()
        {
-            // Rotate old generation to new generation, new generation to old generation            
+            // Rotate old generation to new generation, new generation to old generation
            IGeneration temp = m_newGeneration;
            m_newGeneration = m_oldGeneration;
            m_newGeneration.Clear();
@@ -522,7 +522,7 @@ namespace OpenSim.Framework
            /// <summary>
            /// Index of first element's in element chain.
            /// </summary>
-            /// <value>                        
+            /// <value>
            /// -1 if there is no element in bucket; otherwise first element's index in the element chain.
            /// </value>
            /// <remarks>
@@ -692,7 +692,7 @@ namespace OpenSim.Framework
                /// </summary>
                /// <value>
                /// 0 if element is free; otherwise larger than 0.
-                /// </value>              
+                /// </value>
                public long Size;
                /// <summary>
@@ -771,7 +771,7 @@ namespace OpenSim.Framework
                /// </returns>
                /// <exception cref="InvalidOperationException">
                /// The enumerator has reach end of collection or <see cref="MoveNext"/> is not called.
-                /// </exception>              
+                /// </exception>
                public KeyValuePair<TKey, TValue> Current
                {
                    get
@@ -1405,10 +1405,10 @@ namespace OpenSim.Framework
        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
        /// </para>
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
        public bool IsSizeLimited
@@ -1438,7 +1438,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
        /// </summary>
        /// <value>
        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
@@ -1449,7 +1449,7 @@ namespace OpenSim.Framework
        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
        /// stay longer in cache.
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.PurgeExpired"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
@@ -1503,7 +1503,7 @@ namespace OpenSim.Framework
        /// <seealso cref="ICnmCache{TKey,TValue}.Set"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        public long MaxElementSize
        {
            get { return m_maxElementSize; }
@@ -1517,7 +1517,7 @@ namespace OpenSim.Framework
        /// <value>
        /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </value>
-        /// <remarks>        
+        /// <remarks>
        /// <para>
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
@@ -1562,10 +1562,10 @@ namespace OpenSim.Framework
        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
        /// </para>
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        public long Size
@@ -1576,9 +1576,9 @@ namespace OpenSim.Framework
        /// <summary>
        /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
-        /// <value>        
+        /// <value>
        /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
        /// <remarks>
        /// <para>
        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -1630,7 +1630,7 @@ namespace OpenSim.Framework
        /// </para>
        /// <para>
        /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
@@ -1810,7 +1810,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>
        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/CnmSynchronizedCache.cs b/OpenSim/Framework/CnmSynchronizedCache.cs
index c09900e..2bafbe9 100644
--- a/OpenSim/Framework/CnmSynchronizedCache.cs
+++ b/OpenSim/Framework/CnmSynchronizedCache.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
            /// </returns>
            /// <exception cref="InvalidOperationException">
            /// The enumerator has reach end of collection or <see cref="MoveNext"/> is not called.
-            /// </exception>              
+            /// </exception>
            public KeyValuePair<TKey, TValue> Current
            {
                get { return m_enumerator.Current; }
@@ -327,10 +327,10 @@ namespace OpenSim.Framework
        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
        /// </para>
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
        public bool IsSizeLimited
@@ -366,7 +366,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
        /// </summary>
        /// <value>
        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
@@ -377,7 +377,7 @@ namespace OpenSim.Framework
        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
        /// stay longer in cache.
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.PurgeExpired"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
@@ -440,7 +440,7 @@ namespace OpenSim.Framework
        /// <seealso cref="ICnmCache{TKey,TValue}.Set"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.Size"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        public long MaxElementSize
        {
            get
@@ -458,7 +458,7 @@ namespace OpenSim.Framework
        /// <value>
        /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </value>
-        /// <remarks>        
+        /// <remarks>
        /// <para>
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
@@ -507,10 +507,10 @@ namespace OpenSim.Framework
        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
        /// </para>
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>        
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxSize"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsCountLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
        public long Size
@@ -527,9 +527,9 @@ namespace OpenSim.Framework
        /// <summary>
        /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
-        /// <value>        
+        /// <value>
        /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
        /// <remarks>
        /// <para>
        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -584,7 +584,7 @@ namespace OpenSim.Framework
        /// </para>
        /// <para>
        /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> in the cache.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
@@ -704,7 +704,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>
        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 238810a..8c39ca8 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])
@@ -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..2a1da50 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.
@@ -125,26 +125,26 @@ namespace OpenSim.Framework.Communications.Cache
        /// </summary>
        /// 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;
-                }               
+                }
            }
        }
        
@@ -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 725225d..2872e5e 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -130,16 +130,28 @@ namespace OpenSim.Framework.Communications
        /// <returns>
        /// 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
        // But since Scenes only have IUserService references, I'm placing it here for now.
        bool VerifySession(UUID userID, UUID sessionID);
+        /// <summary>
+        /// Authenticate a user by their password.
+        /// </summary>
+        /// 
+        /// This is used by callers outside the login process that want to
+        /// verify a user who has given their password.
+        ///
+        /// This should probably also be in IAuthentication but is here for the same reasons as VerifySession() is
+        ///
+        /// <param name="userID"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        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 bf59f8e..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);
@@ -1221,11 +1221,13 @@ namespace OpenSim.Framework.Communications.Services
                {
                    return Util.CreateUnknownUserErrorResponse();
                }
+                
                UUID.TryParse((string)requestData["session_id"], out guess_sid);
                if (guess_sid == UUID.Zero)
                {
                    return Util.CreateUnknownUserErrorResponse();
                }
+                
                if (m_userManager.VerifySession(guess_aid, guess_sid))
                {
                    authed = "TRUE";
@@ -1243,6 +1245,5 @@ namespace OpenSim.Framework.Communications.Services
            response.Value = responseData;
            return response;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
index 43f1440..d56211f 100644
--- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
+++ b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
@@ -33,7 +33,7 @@ using OpenMetaverse;
 using OpenSim.Data;
 namespace OpenSim.Framework.Communications
-{                
+{
    /// <summary>
    /// Plugin for managing temporary user profiles.  
    /// </summary>
@@ -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 ac0dc6d..caaebd7 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -149,6 +149,11 @@ namespace OpenSim.Framework.Communications.Tests
            {
                throw new NotImplementedException();
            }
+            public virtual bool AuthenticateUserByPassword(UUID userID, string password)
+            {
+                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 58174a0..bf4f331 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -44,7 +44,8 @@ namespace OpenSim.Framework.Communications
    /// <summary>
    /// Base class for user management (create, read, etc)
    /// </summary>
-    public abstract class UserManagerBase : IUserService, IUserAdminService, IAvatarService, IMessagingService, IAuthentication
+    public abstract class UserManagerBase 
+        : IUserService, IUserAdminService, IAvatarService, IMessagingService, IAuthentication
    {
        private static readonly ILog m_log
            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -649,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;
@@ -891,7 +894,10 @@ namespace OpenSim.Framework.Communications
            if (userProfile != null && userProfile.CurrentAgent != null)
            {
-                m_log.DebugFormat("[USER AUTH]: Verifying session {0} for {1}; current  session {2}", sessionID, userID, userProfile.CurrentAgent.SessionID);
+                m_log.DebugFormat(
+                    "[USER AUTH]: Verifying session {0} for {1}; current  session {2}", 
+                    sessionID, userID, userProfile.CurrentAgent.SessionID);
+                
                if (userProfile.CurrentAgent.SessionID == sessionID)
                {
                    return true;
@@ -901,6 +907,26 @@ namespace OpenSim.Framework.Communications
            return false;
        }
+        public virtual bool AuthenticateUserByPassword(UUID userID, string password)
+        {
+//            m_log.DebugFormat("[USER AUTH]: Authenticating user {0} given password {1}", userID, password);
+            
+            UserProfileData userProfile = GetUserProfile(userID);
+            if (null == userProfile)
+                return false;
+      
+            string md5PasswordHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + userProfile.PasswordSalt);
+//            m_log.DebugFormat(
+//                "[USER AUTH]: Submitted hash {0}, stored hash {1}", md5PasswordHash, userProfile.PasswordHash);
+    
+            if (md5PasswordHash == userProfile.PasswordHash)
+                return true;
+            else
+                return false;
+        }
        #endregion
    }
 }
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 06136ff..9671bc2 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Console
        /// <param name="helpParts">Parsed parts of the help string.  If empty then general help is returned.</param>
        /// <returns></returns>
        public List<string> GetHelp(string[] cmd)
-        {                  
+        {
            List<string> help = new List<string>();
            List<string> helpParts = new List<string>(cmd);
            
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Console
        /// <param name="helpParts"></param>
        /// <returns></returns>
        private List<string> CollectHelp(List<string> helpParts)
-        {            
+        {
            string originalHelpRequest = string.Join(" ", helpParts.ToArray());
            List<string> help = new List<string>();
            
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console
                if (dict[helpPart] is Dictionary<string, Object>)
                    dict = (Dictionary<string, object>)dict[helpPart]; 
                
-                helpParts.RemoveAt(0);                                                               
+                helpParts.RemoveAt(0);
            }
        
            // There was a command for the given help string
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Console
            }
            
            return help;
-        }            
+        }
        private List<string> CollectHelp(Dictionary<string, object> dict)
        {
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.Console
        /// <param name="longhelp"></param>
        /// <param name="fn"></param>
        public void AddCommand(string module, bool shared, string command,
-                string help, string longhelp, CommandDelegate fn)   
+                string help, string longhelp, CommandDelegate fn)
        {
            AddCommand(module, shared, command, help, longhelp,
                    String.Empty, fn);
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 67bff4c..c27072c 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -197,8 +197,8 @@ namespace OpenSim.Framework.Console
            string uri = "/ReadResponses/" + sessionID.ToString() + "/";
-            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpCloseSession,
+            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll,
-                    new PollServiceEventArgs(HasEvents, GetEvents, NoEvents,
+                    new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents,
                    sessionID));
            XmlDocument xmldoc = new XmlDocument();
@@ -230,6 +230,11 @@ namespace OpenSim.Framework.Console
            return reply;
        }
+        private Hashtable HandleHttpPoll(Hashtable request)
+        {
+            return new Hashtable();
+        }
        private Hashtable HandleHttpCloseSession(Hashtable request)
        {
            DoExpire();
@@ -365,7 +370,7 @@ namespace OpenSim.Framework.Console
            }
        }
-        private bool HasEvents(UUID sessionID)
+        private bool HasEvents(UUID RequestID, UUID sessionID)
        {
            ConsoleConnection c = null;
@@ -381,19 +386,19 @@ namespace OpenSim.Framework.Console
            return false;
        }
-        private Hashtable GetEvents(UUID sessionID, string request)
+        private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request)
        {
            ConsoleConnection c = null;
            lock (m_Connections)
            {
                if (!m_Connections.ContainsKey(sessionID))
-                    return NoEvents();
+                    return NoEvents(RequestID, UUID.Zero);
                c = m_Connections[sessionID];
            }
            c.last = System.Environment.TickCount;
            if (c.lastLineSeen >= m_LineNumber)
-                return NoEvents();
+                return NoEvents(RequestID, UUID.Zero);
            Hashtable result = new Hashtable();
@@ -435,7 +440,7 @@ namespace OpenSim.Framework.Console
            return result;
        }
-        private Hashtable NoEvents()
+        private Hashtable NoEvents(UUID RequestID, UUID id)
        {
            Hashtable result = new Hashtable();
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 9aa5d03..3a43a14 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -90,13 +90,13 @@ namespace OpenSim.Framework
            m_configMember.addConfigurationOption("allow_forceful_banlines",
                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Allow Forceful Banlines", "TRUE", true);   
+                                                "Allow Forceful Banlines", "TRUE", true);
            
            m_configMember.addConfigurationOption("allow_region_registration", 
                                                ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
                                                "Allow regions to register immediately upon grid server startup? true/false", 
                                                "True", 
-                                                false);            
+                                                false);
            m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Remote console access user name [Default: disabled]", "", false);
@@ -147,7 +147,7 @@ namespace OpenSim.Framework
                    break;
                case "allow_region_registration":
                    AllowRegionRegistration = (bool)configuration_result;
-                    break;                
+                    break;
                case "console_user":
                    ConsoleUser = (string)configuration_result;
                    break;
diff --git a/OpenSim/Framework/IAssetCache.cs b/OpenSim/Framework/IAssetCache.cs
index 751fdd5..654180d 100644
--- a/OpenSim/Framework/IAssetCache.cs
+++ b/OpenSim/Framework/IAssetCache.cs
@@ -34,23 +34,23 @@ namespace OpenSim.Framework
    /// <summary>
    /// Interface to the local asset cache.  This is the mechanism through which assets can be added and requested.
-    /// </summary>    
+    /// </summary>
    public interface IAssetCache :  IPlugin
    {
        /// <value>
        /// The 'server' from which assets can be requested and to which assets are persisted.
-        /// </value>        
+        /// </value>
       
-        void Initialise(ConfigSettings cs);        
+        void Initialise(ConfigSettings cs);
        /// <summary>
        /// Report statistical data to the log.
-        /// </summary>        
+        /// </summary>
        void ShowState();
        
        /// <summary>
        /// Clear the asset cache.
-        /// </summary>        
+        /// </summary>
        void Clear();
        
        /// <summary>
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="assetId"></param>
        /// <param name="asset"></param>
-        /// <returns>true if the asset was in the cache, false if it was not</returns>        
+        /// <returns>true if the asset was in the cache, false if it was not</returns>
        bool TryGetCachedAsset(UUID assetID, out AssetBase asset);
        
        /// <summary>
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
        /// <param name="isTexture"></param>
        /// A callback invoked when the asset has either been found or not found.
        /// If the asset was found this is called with the asset UUID and the asset data
-        /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>        
+        /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>
        void GetAsset(UUID assetID, AssetRequestCallback callback, bool isTexture);
        
        /// <summary>
@@ -84,13 +84,13 @@ namespace OpenSim.Framework
        ///
        /// <param name="assetID"></param>
        /// <param name="isTexture"></param>
-        /// <returns>null if the asset could not be retrieved</returns>        
+        /// <returns>null if the asset could not be retrieved</returns>
        AssetBase GetAsset(UUID assetID, bool isTexture);
        
        /// <summary>
        /// Add an asset to both the persistent store and the cache.
        /// </summary>
-        /// <param name="asset"></param>        
+        /// <param name="asset"></param>
        void AddAsset(AssetBase asset);
        
        /// <summary>
@@ -100,14 +100,14 @@ namespace OpenSim.Framework
        /// of the asset cache.  This is needed because the osdynamic
        /// texture code grows the asset cache without bounds.  The
        /// real solution here is a much better cache archicture, but
-        /// this is a stop gap measure until we have such a thing.        
+        /// this is a stop gap measure until we have such a thing.
        void ExpireAsset(UUID assetID);
        
        /// <summary>
        /// Handle an asset request from the client.  The result will be sent back asynchronously.
        /// </summary>
        /// <param name="userInfo"></param>
-        /// <param name="transferRequest"></param>        
+        /// <param name="transferRequest"></param>
        void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest);
    }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 444adf9..4bc35e6 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -810,7 +810,7 @@ namespace OpenSim.Framework
        /// </summary>
        void Start();
        
-        void Stop();        
+        void Stop();
        //     void ActivateGesture(UUID assetId, UUID gestureId);
@@ -824,7 +824,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="agentID">The id of the agent associated with the appearance</param>
        /// <param name="visualParams"></param>
-        /// <param name="textureEntry"></param>        
+        /// <param name="textureEntry"></param>
        void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
        void SendStartPingCheck(byte seq);
@@ -833,7 +833,7 @@ namespace OpenSim.Framework
        /// Tell the client that an object has been deleted
        /// </summary>
        /// <param name="regionHandle"></param>
-        /// <param name="localID"></param>        
+        /// <param name="localID"></param>
        void SendKillObject(ulong regionHandle, uint localID);
        void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index a1ac322..27b9c56 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -180,16 +180,16 @@ namespace OpenSim.Framework
        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
        /// </para>
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="MaxElementSize"/>
        /// <seealso cref="Size"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
        /// <seealso cref="IsCountLimited"/>
        /// <seealso cref="IsTimeLimited"/>
        bool IsSizeLimited { get; }
        /// <summary>
-        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.        
+        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
        /// </summary>
        /// <value>
        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
@@ -200,7 +200,7 @@ namespace OpenSim.Framework
        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from 
        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
        /// stay longer in cache.
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="ExpirationTime"/>
        /// <seealso cref="PurgeExpired"/>
        /// <seealso cref="IsCountLimited"/>
@@ -237,7 +237,7 @@ namespace OpenSim.Framework
        /// <seealso cref="Set"/>
        /// <seealso cref="IsSizeLimited"/>
        /// <seealso cref="Size"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
        long MaxElementSize { get; }
        /// <summary>
@@ -246,7 +246,7 @@ namespace OpenSim.Framework
        /// <value>
        /// Maximal allowed total size for elements stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </value>
-        /// <remarks>        
+        /// <remarks>
        /// <para>
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
@@ -278,10 +278,10 @@ namespace OpenSim.Framework
        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
        /// </para>
-        /// </remarks>        
+        /// </remarks>
        /// <seealso cref="MaxElementSize"/>
        /// <seealso cref="IsSizeLimited"/>
-        /// <seealso cref="MaxSize"/>        
+        /// <seealso cref="MaxSize"/>
        /// <seealso cref="IsCountLimited"/>
        /// <seealso cref="ExpirationTime"/>
        long Size { get; }
@@ -289,9 +289,9 @@ namespace OpenSim.Framework
        /// <summary>
        /// Gets an object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
-        /// <value>        
+        /// <value>
        /// An object that can be used to synchronize access to the <see cref="ICnmCache{TKey,TValue}"/>.
-        /// </value>        
+        /// </value>
        /// <remarks>
        /// <para>
        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
@@ -322,7 +322,7 @@ namespace OpenSim.Framework
        /// </para>
        /// <para>
        /// Depending on <see cref="ICnmCache{TKey,TValue}"/> implementation, some of expired elements
-        /// may stay longer than <see cref="ExpirationTime"/> in the cache.        
+        /// may stay longer than <see cref="ExpirationTime"/> in the cache.
        /// </para>
        /// </remarks>
        /// <seealso cref="IsTimeLimited"/>
@@ -418,7 +418,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>
        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
-        /// the specified key; otherwise, <see langword="false"/>.        
+        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index ba4c616..307c6bc 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -46,8 +46,6 @@ namespace OpenSim.Framework
    public delegate bool CloseAgentConnection(UUID agentID);
-    public delegate bool RegionUp(RegionInfo region);
    public delegate bool ChildAgentUpdate(ChildAgentDataUpdate cAgentData);
    public delegate void LogOffUser(UUID agentID, UUID regionSecret, string message);
@@ -65,7 +63,6 @@ namespace OpenSim.Framework
        event AcknowledgePrimCross OnAcknowledgePrimCrossed;
        event UpdateNeighbours OnNeighboursUpdate;
        event CloseAgentConnection OnCloseAgentConnection;
-        event RegionUp OnRegionUp;
        event ChildAgentUpdate OnChildAgentUpdate;
        event LogOffUser OnLogOffUser;
        event GetLandData OnGetLandData;
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 2e2c703..489653f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
        GodTakeCopy = 5,
        Delete = 6,
        Return = 9
-    };     
+    };
    public interface IScene
    {
@@ -74,7 +74,7 @@ namespace OpenSim.Framework
        void CloseAllAgents(uint circuitcode);
        void Restart(int seconds);
-        bool OtherRegionUp(RegionInfo thisRegion);
+        //RegionInfo OtherRegionUp(RegionInfo thisRegion);
        string GetSimulatorVersion();
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index db19527..4fc3e01 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
    public interface ISceneObject
    {
-        UUID UUID { get; }            
+        UUID UUID { get; }
        ISceneObject CloneForNewScene();
        string ToXml2();
        string ExtraToXmlString();
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index 3eef6f6..a12183c 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework
            ID = id;
            Name = name;
            Owner = owner;
-            ParentID = parent;           
+            ParentID = parent;
        }
        public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version)
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 00462f9..6b432f3 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Framework
        /// <summary>
        /// Find a folder given a PATH_DELIMITER delimited path starting from this folder
-        /// </summary>        
+        /// </summary>
        ///
        /// This method does not handle paths that contain multiple delimitors
        ///
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 7150c82..aeb01e2 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -34,10 +34,10 @@ namespace OpenSim.Framework
    /// Inventory Item - contains all the properties associated with an individual inventory piece.
    /// </summary>
    public class InventoryItemBase : InventoryNodeBase, ICloneable
-    {       
+    {
        /// <value>
        /// The inventory type of the item.  This is slightly different from the asset type in some situations.
-        /// </value>        
+        /// </value>
        public int InvType 
        { 
            get
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
        /// <value>
        /// The folder this item is contained in
-        /// </value>        
+        /// </value>
        public UUID Folder 
        { 
            get
@@ -71,7 +71,7 @@ namespace OpenSim.Framework
        /// <value>
        /// The creator of this item
-        /// </value>        
+        /// </value>
        public string CreatorId 
        { 
            get
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
            {
                m_creatorIdAsUuid = value;
            }
-        }     
+        }
        protected UUID m_creatorIdAsUuid = UUID.Zero;
        /// <value>
@@ -130,13 +130,13 @@ namespace OpenSim.Framework
            set
            {
                m_description = value;
-            }            
+            }
        }
        protected string m_description = String.Empty;
        /// <value>
        ///
-        /// </value>          
+        /// </value>
        public uint NextPermissions 
        { 
            get
@@ -153,7 +153,7 @@ namespace OpenSim.Framework
        /// <value>
        /// A mask containing permissions for the current owner (cannot be enforced)
-        /// </value>        
+        /// </value>
        public uint CurrentPermissions 
        { 
            get
@@ -170,7 +170,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint BasePermissions 
        { 
            get
@@ -187,7 +187,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint EveryOnePermissions 
        { 
            get
@@ -204,7 +204,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint GroupPermissions 
        { 
            get
@@ -221,7 +221,7 @@ namespace OpenSim.Framework
        /// <value>
        /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
-        /// </value>        
+        /// </value>
        public int AssetType 
        { 
            get
@@ -238,7 +238,7 @@ namespace OpenSim.Framework
        /// <value>
        /// The UUID of the associated asset on the asset server
-        /// </value>        
+        /// </value>
        public UUID AssetID 
        { 
            get
@@ -255,7 +255,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public UUID GroupID 
        { 
            get
@@ -272,13 +272,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public bool GroupOwned 
        { 
            get
            {
                return m_groupOwned;
-            }               
+            }
                
            set
            {
@@ -289,7 +289,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public int SalePrice 
        { 
            get
@@ -306,7 +306,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public byte SaleType 
        { 
            get
@@ -323,7 +323,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public uint Flags 
        { 
            get
@@ -340,7 +340,7 @@ namespace OpenSim.Framework
        /// <value>
        ///
-        /// </value>        
+        /// </value>
        public int CreationDate 
        { 
            get
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index f49cce1..31c3fd1 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -31,12 +31,12 @@ namespace OpenSim.Framework
 {
    /// <summary>
    /// Common base class for inventory nodes of different types (files, folders, etc.)
-    /// </summary>        
+    /// </summary>
    public class InventoryNodeBase
-    {                
+    {
        /// <summary>
        /// The name of the node (64 characters or less)
-        /// </summary>        
+        /// </summary>
        public virtual string Name
        {
            get { return m_name; }
@@ -51,17 +51,17 @@ namespace OpenSim.Framework
        {
            get { return m_id; }
            set { m_id = value; }
-        }       
+        }
        private UUID m_id;
        
        /// <summary>
        /// The agent who's inventory this is contained by
-        /// </summary>        
+        /// </summary>
        public virtual UUID Owner
        {
            get { return m_owner; }
            set { m_owner = value; }
        }
-        private UUID m_owner;        
+        private UUID m_owner;
    }
 }
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 3b00af3..f720222 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
    public class NetworkServersInfo
    {
-        public string AssetSendKey = String.Empty;        
+        public string AssetSendKey = String.Empty;
        public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
        public string GridRecvKey = String.Empty;
@@ -102,8 +102,7 @@ namespace OpenSim.Framework
                                                               ConfigSettings.DefaultInventoryServerHttpPort.ToString());
            secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
-            MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
+            MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty);
-                                                               "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort);
        }
    }
 }
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 016c78c..90200d6 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Framework
        private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
        private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
        private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
-        private RegionUp handlerRegionUp = null; // OnRegionUp;
        private LogOffUser handlerLogOffUser = null;
        private GetLandData handlerGetLandData = null;
@@ -62,7 +61,6 @@ namespace OpenSim.Framework
        public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
        public event AcknowledgePrimCross OnAcknowledgePrimCrossed;
        public event CloseAgentConnection OnCloseAgentConnection;
-        public event RegionUp OnRegionUp;
        public event ChildAgentUpdate OnChildAgentUpdate;
        public event LogOffUser OnLogOffUser;
        public event GetLandData OnGetLandData;
@@ -108,17 +106,6 @@ namespace OpenSim.Framework
            return false;
        }
-        public virtual bool TriggerRegionUp(RegionInfo region)
-        {
-            handlerRegionUp = OnRegionUp;
-            if (handlerRegionUp != null)
-            {
-                handlerRegionUp(region);
-                return true;
-            }
-            return false;
-        }
        public virtual bool TriggerChildAgentUpdate(ChildAgentDataUpdate cAgentData)
        {
            handlerChildAgentUpdate = OnChildAgentUpdate;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 3896a6e..d3a5357 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -26,6 +26,7 @@
 */
 using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Xml;
@@ -63,6 +64,13 @@ namespace OpenSim.Framework
        }
        protected string m_serverURI;
+        public string RegionName
+        {
+            get { return m_regionName; }
+            set { m_regionName = value; }
+        }
+        protected string m_regionName = String.Empty;
        protected bool Allow_Alternate_Ports;
        public bool m_allow_alternate_ports;
        protected string m_externalHostName;
@@ -100,6 +108,7 @@ namespace OpenSim.Framework
        public SimpleRegionInfo(RegionInfo ConvertFrom)
        {
+            m_regionName = ConvertFrom.RegionName;
            m_regionLocX = ConvertFrom.RegionLocX;
            m_regionLocY = ConvertFrom.RegionLocY;
            m_internalEndPoint = ConvertFrom.InternalEndPoint;
@@ -197,6 +206,67 @@ namespace OpenSim.Framework
        {
            return m_internalEndPoint.Port;
        }
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> kvp = new Dictionary<string, object>();
+            kvp["uuid"] = RegionID.ToString();
+            kvp["locX"] = RegionLocX.ToString();
+            kvp["locY"] = RegionLocY.ToString();
+            kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
+            kvp["external_port"] = ExternalEndPoint.Port.ToString();
+            kvp["external_host_name"] = ExternalHostName;
+            kvp["http_port"] = HttpPort.ToString();
+            kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
+            kvp["internal_port"] = InternalEndPoint.Port.ToString();
+            kvp["alternate_ports"] = m_allow_alternate_ports.ToString();
+            kvp["server_uri"] = ServerURI;
+            return kvp;
+        }
+        public SimpleRegionInfo(Dictionary<string, object> kvp)
+        {
+            if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null))
+            {
+                int port = 0;
+                Int32.TryParse((string)kvp["external_port"], out port);
+                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["external_ip_address"]), port);
+                ExternalEndPoint = ep;
+            }
+            else
+                ExternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            if (kvp["external_host_name"] != null)
+                ExternalHostName = (string)kvp["external_host_name"];
+            if (kvp["http_port"] != null)
+            {
+                UInt32 port = 0;
+                UInt32.TryParse((string)kvp["http_port"], out port);
+                HttpPort = port;
+            }
+            if ((kvp["internal_ip_address"] != null) && (kvp["internal_port"] != null))
+            {
+                int port = 0;
+                Int32.TryParse((string)kvp["internal_port"], out port);
+                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["internal_ip_address"]), port);
+                InternalEndPoint = ep;
+            }
+            else
+                InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            if (kvp["alternate_ports"] != null)
+            {
+                bool alts = false;
+                Boolean.TryParse((string)kvp["alternate_ports"], out alts);
+                m_allow_alternate_ports = alts;
+            }
+            if (kvp["server_uri"] != null)
+                ServerURI = (string)kvp["server_uri"];
+        }
    }
    public class RegionInfo : SimpleRegionInfo
@@ -222,7 +292,6 @@ namespace OpenSim.Framework
        public UUID originRegionID = UUID.Zero;
        public string proxyUrl = "";
        public int ProxyOffset = 0;
-        public string RegionName = String.Empty;
        public string regionSecret = UUID.Random().ToString();
        
        public string osSecret;
@@ -971,7 +1040,7 @@ namespace OpenSim.Framework
        public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort, string serverURI)
        {
            RegionInfo regionInfo;
-            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)simPort);                    
+            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)simPort);
            regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalHostName);
            regionInfo.RemotingPort = remotingPort;
            regionInfo.RemotingAddress = externalHostName;
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
new file mode 100644
index 0000000..6bfae41
--- /dev/null
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using OpenMetaverse;
+using OpenSim.Framework;
+namespace OpenSim.Framework.Serialization.External
+{
+    /// <summary>
+    /// Serialize and deserialize LandData as an external format.
+    /// </summary>
+    public class LandDataSerializer
+    {
+        protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
+        
+        /// <summary>
+        /// Reify/deserialize landData
+        /// </summary>
+        /// <param name="serializedLandData"></param>
+        /// <returns></returns>
+        /// <exception cref="System.Xml.XmlException"></exception>
+        public static LandData Deserialize(byte[] serializedLandData)
+        {
+            return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
+        }
+        
+        /// <summary>
+        /// Reify/deserialize landData
+        /// </summary>
+        /// <param name="serializedLandData"></param>
+        /// <returns></returns>
+        /// <exception cref="System.Xml.XmlException"></exception>
+        public static LandData Deserialize(string serializedLandData)
+        {
+            LandData landData = new LandData();
+            
+            StringReader sr = new StringReader(serializedLandData);
+            XmlTextReader xtr = new XmlTextReader(sr);
+            
+            xtr.ReadStartElement("LandData");
+            landData.Area           = Convert.ToInt32(                 xtr.ReadElementString("Area"));
+            landData.AuctionID      = Convert.ToUInt32(                xtr.ReadElementString("AuctionID"));
+            landData.AuthBuyerID    = UUID.Parse(                      xtr.ReadElementString("AuthBuyerID"));
+            landData.Category       = (ParcelCategory)Convert.ToSByte( xtr.ReadElementString("Category"));
+            landData.ClaimDate      = Convert.ToInt32(                 xtr.ReadElementString("ClaimDate"));
+            landData.ClaimPrice     = Convert.ToInt32(                 xtr.ReadElementString("ClaimPrice"));
+            landData.GlobalID       = UUID.Parse(                      xtr.ReadElementString("GlobalID"));
+            landData.GroupID        = UUID.Parse(                      xtr.ReadElementString("GroupID"));
+            landData.IsGroupOwned   = Convert.ToBoolean(               xtr.ReadElementString("IsGroupOwned"));
+            landData.Bitmap         = Convert.FromBase64String(        xtr.ReadElementString("Bitmap"));
+            landData.Description    =                                  xtr.ReadElementString("Description");
+            landData.Flags          = Convert.ToUInt32(                xtr.ReadElementString("Flags"));
+            landData.LandingType    = Convert.ToByte(                  xtr.ReadElementString("LandingType"));
+            landData.Name           =                                  xtr.ReadElementString("Name");
+            landData.Status         = (ParcelStatus)Convert.ToSByte(   xtr.ReadElementString("Status"));
+            landData.LocalID        = Convert.ToInt32(                 xtr.ReadElementString("LocalID"));
+            landData.MediaAutoScale = Convert.ToByte(                  xtr.ReadElementString("MediaAutoScale"));
+            landData.MediaID        = UUID.Parse(                      xtr.ReadElementString("MediaID"));
+            landData.MediaURL       =                                  xtr.ReadElementString("MediaURL");
+            landData.MusicURL       =                                  xtr.ReadElementString("MusicURL");
+            landData.OwnerID        = UUID.Parse(                      xtr.ReadElementString("OwnerID"));
+            landData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+            xtr.ReadStartElement("ParcelAccessList");
+            while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
+            {
+                ParcelManager.ParcelAccessEntry pae;
+                xtr.ReadStartElement("ParcelAccessEntry");
+                pae.AgentID    = UUID.Parse(                           xtr.ReadElementString("AgentID"));
+                pae.Time       = Convert.ToDateTime(                   xtr.ReadElementString("Time"));
+                pae.Flags      = (AccessList)Convert.ToUInt32(         xtr.ReadElementString("AccessList"));
+                xtr.ReadEndElement();
+                landData.ParcelAccessList.Add(pae);
+            }
+            xtr.ReadEndElement();
+            landData.PassHours      = Convert.ToSingle(                xtr.ReadElementString("PassHours"));
+            landData.PassPrice      = Convert.ToInt32(                 xtr.ReadElementString("PassPrice"));
+            landData.SalePrice      = Convert.ToInt32(                 xtr.ReadElementString("SalePrice"));
+            landData.SnapshotID     = UUID.Parse(                      xtr.ReadElementString("SnapshotID"));
+            landData.UserLocation   = Vector3.Parse(                   xtr.ReadElementString("UserLocation"));
+            landData.UserLookAt     = Vector3.Parse(                   xtr.ReadElementString("UserLookAt"));
+            landData.Dwell          = Convert.ToInt32(                 xtr.ReadElementString("Dwell"));
+            landData.OtherCleanTime = Convert.ToInt32(                 xtr.ReadElementString("OtherCleanTime"));
+            xtr.ReadEndElement();
+            
+            xtr.Close();
+            sr.Close();
+            
+            return landData;
+        }
+        
+        public static string Serialize(LandData landData)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter xtw = new XmlTextWriter(sw);
+            xtw.Formatting = Formatting.Indented;
+            xtw.WriteStartDocument();
+            xtw.WriteStartElement("LandData");
+            
+            xtw.WriteElementString("Area", landData.Area.ToString());            
+            xtw.WriteElementString("AuctionID", landData.AuctionID.ToString());
+            xtw.WriteElementString("AuthBuyerID", landData.AuthBuyerID.ToString());
+            xtw.WriteElementString("Category", landData.Category.ToString());
+            xtw.WriteElementString("ClaimDate", landData.ClaimDate.ToString());
+            xtw.WriteElementString("ClaimPrice", landData.ClaimPrice.ToString());
+            xtw.WriteElementString("GlobalID", landData.GlobalID.ToString());
+            xtw.WriteElementString("GroupID", landData.GroupID.ToString());
+            xtw.WriteElementString("IsGroupOwned", landData.IsGroupOwned.ToString());
+            xtw.WriteElementString("Bitmap", landData.Bitmap.ToString());
+            xtw.WriteElementString("Description", landData.Description);
+            xtw.WriteElementString("Flags", landData.Flags.ToString());
+            xtw.WriteElementString("LandingType", landData.LandingType.ToString());
+            xtw.WriteElementString("Name", landData.Name);
+            xtw.WriteElementString("Status", landData.Status.ToString());
+            xtw.WriteElementString("LocalID", landData.LocalID.ToString());
+            xtw.WriteElementString("MediaAutoScale", landData.MediaAutoScale.ToString());
+            xtw.WriteElementString("MediaID", landData.MediaID.ToString());
+            xtw.WriteElementString("MediaURL", landData.MediaURL.ToString());
+            xtw.WriteElementString("MusicURL", landData.MusicURL.ToString());
+            xtw.WriteElementString("OwnerID", landData.OwnerID.ToString());
+            xtw.WriteStartElement("ParcelAccessList");
+            foreach(ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
+            {
+                xtw.WriteStartElement("ParcelAccessEntry");
+                xtw.WriteElementString("AgentID", pal.AgentID.ToString());
+                xtw.WriteElementString("Time", pal.Time.ToString());
+                xtw.WriteElementString("AccessList", pal.Flags.ToString());
+                xtw.WriteEndElement();
+            }
+            xtw.WriteEndElement();
+            
+            xtw.WriteElementString("PassHours", landData.PassHours.ToString());
+            xtw.WriteElementString("PassPrice", landData.PassPrice.ToString());
+            xtw.WriteElementString("SalePrice", landData.SalePrice.ToString());
+            xtw.WriteElementString("SnapshotID", landData.SnapshotID.ToString());
+            xtw.WriteElementString("UserLocation", landData.UserLocation.ToString());
+            xtw.WriteElementString("UserLookAt", landData.UserLookAt.ToString());
+            xtw.WriteElementString("Dwell", landData.Dwell.ToString());
+            xtw.WriteElementString("OtherCleanTime", landData.OtherCleanTime.ToString());
+            xtw.WriteEndElement();
+            xtw.Close();
+            sw.Close();
+            
+            return sw.ToString();
+        }
+    }
+}
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 274f41f..b5901e1 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Serialization.External
                        settings.Elevation2NE = double.Parse(xtr.ReadElementContentAsString());
                        break;
                }
-            }                    
+            }
           
            xtr.ReadEndElement();
            xtr.ReadStartElement("Terrain");
@@ -200,8 +200,8 @@ namespace OpenSim.Framework.Serialization.External
            
            xtw.WriteStartElement("RegionSettings");
            
-            xtw.WriteStartElement("General");            
+            xtw.WriteStartElement("General");
-            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());            
+            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());
            xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString());
            xtw.WriteElementString("AllowLandJoinDivide", settings.AllowLandJoinDivide.ToString());
            xtw.WriteElementString("BlockFly", settings.BlockFly.ToString());
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index eb77e65..fb269b7 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Serialization.External
    /// Serialize and deserialize region settings as an external format.
    /// </summary>
    public class UserProfileSerializer
-    {    
+    {
        public const int MAJOR_VERSION = 0;
        public const int MINOR_VERSION = 1;
        
@@ -65,6 +65,6 @@ namespace OpenSim.Framework.Serialization.External
            sw.Close();
            
            return sw.ToString();
-        }        
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs b/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
deleted file mode 100644
index 8372ae7..0000000
--- a/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
+++ /dev/null
@@ -1,205 +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;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Serialization;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Framework.Statistics;
-namespace OpenSim.Framework.Servers
-{
-    public abstract class BaseGetAssetStreamHandler : BaseStreamHandler
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        protected BaseGetAssetStreamHandler(string httpMethod, string path) : base(httpMethod, path)
-        {
-        }
-        protected abstract AssetBase GetAsset(UUID assetID);
-        public override byte[] Handle(string path, Stream request,
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-        {
-            byte[] result = new byte[] { };
-            string[] p = SplitParams(path);
-            if (p.Length > 0)
-            {
-                UUID assetID;
-                
-                if (!UUID.TryParse(p[0], out assetID))
-                {
-                    m_log.DebugFormat(
-                        "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
-                    return result;
-                }
-                if (StatsManager.AssetStats != null)
-                {
-                    StatsManager.AssetStats.AddRequest();
-                }
-                AssetBase asset = GetAsset(assetID); 
-                if (asset != null)
-                {
-                    if (p.Length > 1 && p[1] == "data")
-                    {
-                        httpResponse.StatusCode = (int)HttpStatusCode.OK;
-                        httpResponse.ContentType = SLAssetTypeToContentType(asset.Type);
-                        result = asset.Data;
-                    }
-                    else
-                    {
-                        result = GetXml(asset);
-                    }
-                }
-                else
-                {
-                    m_log.DebugFormat("[REST]: GET:/asset failed to find {0}", assetID);
-                    
-                    httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
-                    
-                    if (StatsManager.AssetStats != null)
-                    {
-                        StatsManager.AssetStats.AddNotFoundRequest();
-                    }
-                }
-            }
-            return result;
-        }
-        public static byte[] GetXml(AssetBase asset)
-        {
-            byte[] result;
-            XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
-            xw.Formatting = Formatting.Indented;
-            xs.Serialize(xw, asset);
-            xw.Flush();
-            ms.Seek(0, SeekOrigin.Begin);
-            //StreamReader sr = new StreamReader(ms);
-            result = ms.GetBuffer();
-            Array.Resize<byte>(ref result, (int)ms.Length);
-            return result;
-        }
-        public string ProcessAssetDataString(string data)
-        {
-            Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)");
-            // IUserService userService = null;
-            data = regex.Replace(data, delegate(Match m)
-                                           {
-                                               string result = String.Empty;
-//                string key = m.Groups[1].Captures[0].Value;
-//
-//                string value = m.Groups[2].Captures[0].Value;
-//
-//                Guid userUri;
-//
-//                switch (key)
-//                {
-//                    case "creator_id":
-//                        userUri = new Guid(value);
-//                        //         result = "creator_url " + userService(userService, userUri);
-//                        break;
-//
-//                    case "owner_id":
-//                        userUri = new Guid(value);
-//                        //       result = "owner_url " + ResolveUserUri(userService, userUri);
-//                        break;
-//                }
-                                               return result;
-                                           });
-            return data;
-        }
-        private string SLAssetTypeToContentType(int assetType)
-        {
-            switch (assetType)
-            {
-                case 0:
-                    return "image/jp2";
-                case 1:
-                    return "application/ogg";
-                case 2:
-                    return "application/x-metaverse-callingcard";
-                case 3:
-                    return "application/x-metaverse-landmark";
-                case 5:
-                    return "application/x-metaverse-clothing";
-                case 6:
-                    return "application/x-metaverse-primitive";
-                case 7:
-                    return "application/x-metaverse-notecard";
-                case 8:
-                    return "application/x-metaverse-folder";
-                case 10:
-                    return "application/x-metaverse-lsl";
-                case 11:
-                    return "application/x-metaverse-lso";
-                case 12:
-                    return "image/tga";
-                case 13:
-                    return "application/x-metaverse-bodypart";
-                case 17:
-                    return "audio/x-wav";
-                case 19:
-                    return "image/jpeg";
-                case 20:
-                    return "application/x-metaverse-animation";
-                case 21:
-                    return "application/x-metaverse-gesture";
-                case 22:
-                    return "application/x-metaverse-simstate";
-                default:
-                    return "application/octet-stream";
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 7a244ff..632b551 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Servers
                        m_consoleAppender.Threshold = Level.All;
                    
                    Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
-                }                                          
+                }
                
                m_console.Commands.AddCommand("base", false, "quit",
                        "quit",
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
        
        /// <summary>
        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>      
+        /// </summary>
        public virtual void ShutdownSpecific() {}
        
        /// <summary>
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Servers
        /// </summary>
        public virtual void Startup()
        {
-            m_log.Info("[STARTUP]: Beginning startup processing");                        
+            m_log.Info("[STARTUP]: Beginning startup processing");
            EnhanceVersionInformation();
            
@@ -301,7 +301,7 @@ namespace OpenSim.Framework.Servers
        /// <summary>
        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>      
+        /// </summary>
        public virtual void Shutdown()
        {
            ShutdownSpecific();
@@ -367,7 +367,7 @@ namespace OpenSim.Framework.Servers
        }
        public virtual void HandleShow(string module, string[] cmd)
-        {            
+        {
            List<string> args = new List<string>(cmd);
            args.RemoveAt(0);
@@ -375,7 +375,7 @@ namespace OpenSim.Framework.Servers
            string[] showParams = args.ToArray();
            switch (showParams[0])
-            {                       
+            {
                case "info":
                    Notice("Version: " + m_version);
                    Notice("Startup directory: " + m_startupDirectory);
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
deleted file mode 100644
index ad5281d..0000000
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ /dev/null
@@ -1,26 +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.
- */
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
deleted file mode 100644
index c6958de..0000000
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ /dev/null
@@ -1,63 +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;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Serialization;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Framework.Statistics;
-using System.Net;
-namespace OpenSim.Framework.Servers
-{
-    public class GetAssetStreamHandler : BaseGetAssetStreamHandler
-    {
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly IAssetDataPlugin m_assetProvider;
-        public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
-            : base("GET", "/assets")
-        {
-            m_assetProvider = assetProvider;
-        }
-        protected override AssetBase GetAsset(UUID assetID)
-        {
-            return m_assetProvider.GetAsset(assetID);
-        }
-    }
-}
diff --git a/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
index fe69ad3..5afa110 100644
--- a/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}", verb, requestUrl, e);
                }
                    
-            }, null);         
+            }, null);
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 771ae05..6c63c6c 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public BaseHttpServer(uint port, bool ssl) : this (port)
        {
-            m_ssl = ssl;          
+            m_ssl = ssl;
        }
        public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) : this (port, ssl)
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            lock (m_rpcHandlers)
            {
                m_rpcHandlers[method] = handler;
-                m_rpcHandlersKeepAlive[method] = keepAlive; // default              
+                m_rpcHandlersKeepAlive[method] = keepAlive; // default
            }
            
            return true;
@@ -256,13 +256,51 @@ namespace OpenSim.Framework.Servers.HttpServer
            IHttpClientContext context = (IHttpClientContext)source;
            IHttpRequest request = args.Request;
            
            PollServiceEventArgs psEvArgs;
            if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs))
            {
-                
+                PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
-                m_PollServiceManager.Enqueue(new PollServiceHttpRequest(psEvArgs, context, request));
-                //DoHTTPGruntWork(psEvArgs.NoEvents(),new OSHttpResponse(new HttpResponse(context, request)));
+                if (psEvArgs.Request != null)
+                {
+                    OSHttpRequest req = new OSHttpRequest(context, request);
+                    
+                    Stream requestStream = req.InputStream;
+                    Encoding encoding = Encoding.UTF8;
+                    StreamReader reader = new StreamReader(requestStream, encoding);
+                    string requestBody = reader.ReadToEnd();
+                    Hashtable keysvals = new Hashtable();
+                    Hashtable headervals = new Hashtable();
+                    string[] querystringkeys = req.QueryString.AllKeys;
+                    string[] rHeaders = req.Headers.AllKeys;
+                    keysvals.Add("body", requestBody);
+                    keysvals.Add("uri", req.RawUrl);
+                    keysvals.Add("content-type", req.ContentType);
+                    keysvals.Add("http-method", req.HttpMethod);
+                    foreach (string queryname in querystringkeys)
+                    {
+                        keysvals.Add(queryname, req.QueryString[queryname]);
+                    }
+                    foreach (string headername in rHeaders)
+                    {
+                        headervals[headername] = req.Headers[headername];
+                    }
+                    keysvals.Add("headers",headervals);
+                    keysvals.Add("querystringkeys", querystringkeys);
+                    psEvArgs.Request(psreq.RequestID, keysvals);
+                }
+                m_PollServiceManager.Enqueue(psreq);
            }
            else
            {
@@ -275,49 +313,17 @@ namespace OpenSim.Framework.Servers.HttpServer
        {
            OSHttpRequest req = new OSHttpRequest(context, request);
            OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-            //resp.KeepAlive = req.KeepAlive;
-            //m_log.Info("[Debug BASE HTTP SERVER]: Got Request");
-            //HttpServerContextObj objstate= new HttpServerContextObj(req,resp);
-            //ThreadPool.QueueUserWorkItem(new WaitCallback(ConvertIHttpClientContextToOSHttp), (object)objstate);
            HandleRequest(req, resp);
        }
        public void ConvertIHttpClientContextToOSHttp(object stateinfo)
        {
            HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
-            //OSHttpRequest request = new OSHttpRequest(objstate.context,objstate.req);
-            //OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(objstate.context, objstate.req));
            OSHttpRequest request = objstate.oreq;
            OSHttpResponse resp = objstate.oresp;
-            //OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(objstate.context, objstate.req));
-            /*
+            HandleRequest(request,resp);
-            request.AcceptTypes = objstate.req.AcceptTypes;
-            request.ContentLength = (long)objstate.req.ContentLength;
-            request.Headers = objstate.req.Headers;
-            request.HttpMethod = objstate.req.Method;
-            request.InputStream = objstate.req.Body;
-            foreach (string str in request.Headers)
-            {
-                if (str.ToLower().Contains("content-type: "))
-                {
-                    request.ContentType = str.Substring(13, str.Length - 13);
-                    break;
-                }
-            }
-            //request.KeepAlive = objstate.req.
-            foreach (HttpServer.HttpInput httpinput in objstate.req.QueryString)
-            {
-                request.QueryString.Add(httpinput.Name, httpinput[httpinput.Name]);
-            }
-            
-            //request.Query = objstate.req.//objstate.req.QueryString;
-            //foreach (
-            //request.QueryString = objstate.req.QueryString;
-             */
-            HandleRequest(request,resp);           
        }
        public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
@@ -332,6 +338,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                //  probability event; if a request is matched it is normally expected to be
                //  handled
                //m_log.Debug("[BASE HTTP SERVER]: Handling Request" + request.RawUrl);
                IHttpAgentHandler agentHandler;
                if (TryGetAgentHandler(request, response, out agentHandler))
@@ -342,10 +349,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                    }
                }
-                IRequestHandler requestHandler;
                //response.KeepAlive = true;
                response.SendChunked = false;
+                IRequestHandler requestHandler;
                string path = request.RawUrl;
                string handlerKey = GetHandlerKey(request.HttpMethod, path);
@@ -359,6 +367,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
                    if (requestHandler is IStreamedRequestHandler)
                    {
                        IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
@@ -404,6 +413,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        //                        }
                        keysvals.Add("requestbody", requestBody);
+                        keysvals.Add("headers",headervals);
                        if (keysvals.Contains("method"))
                        {
                            //m_log.Warn("[HTTP]: Contains Method");
@@ -702,7 +712,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    lock (m_rpcHandlers)
                    {
                        methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method);
-                    }                            
+                    }
                    
                    if (methodWasFound)
                    {
@@ -726,8 +736,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                    else
                    {
                        xmlRpcResponse = new XmlRpcResponse();
+                        
                        // Code set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
-                        xmlRpcResponse.SetFault(-32601, String.Format("Requested method [{0}] not found", methodName));
+                        xmlRpcResponse.SetFault(
+                            XmlRpcErrorCodes.SERVER_ERROR_METHOD, 
+                            String.Format("Requested method [{0}] not found", methodName));
                    }
                    responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
@@ -747,6 +760,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    response.SendChunked = false;
                    response.ContentLength64 = buf.Length;
                    response.ContentEncoding = Encoding.UTF8;
+                    
                    try
                    {
                        response.OutputStream.Write(buf, 0, buf.Length);
@@ -917,7 +931,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                catch (IOException e)
                {
-                    m_log.DebugFormat("[BASE HTTP SERVER] LLSD IOException {0}.", e);                    
+                    m_log.DebugFormat("[BASE HTTP SERVER] LLSD IOException {0}.", e);
                }
                catch (SocketException e)
                {
@@ -1354,7 +1368,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                                bestMatch = pattern;
                        }
                    }
-                }           
+                }
                if (String.IsNullOrEmpty(bestMatch))
                {
@@ -1466,7 +1480,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                {
                    m_log.Warn("[BASE HTTP SERVER] XmlRpcRequest issue: " + e.Message);
                }
-            }            
+            }
        }
        public void SendHTML404(OSHttpResponse response, string host)
@@ -1575,7 +1589,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    // if you want more detailed trace information from the HttpServer
                    //m_httpListener2.UseTraceLogs = true;
                    
-                    //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;                    
+                    //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;
                }
                else
                {
@@ -1610,7 +1624,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
-        {            
+        {
            switch (err)
            {
                case SocketError.NotSocket:
@@ -1621,7 +1635,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        public void httpServerException(object source, Exception exception)
-        {            
+        {
            m_log.ErrorFormat("[HTTPSERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
           /*
            if (HTTPDRunning)// && NotSocketErrors > 5)
@@ -1648,7 +1662,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            } 
            catch (NullReferenceException)
            {
-                m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");    
+                m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");
            }
            
        }
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index 1bdf4fa..d13408d 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -128,6 +128,6 @@ namespace OpenSim.Framework.Servers.HttpServer
        
        string GetHTTP404(string host);
-        string GetHTTP500();       
+        string GetHTTP500();
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index fed490e..9d512c6 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -30,20 +30,23 @@ using System.Collections;
 using OpenMetaverse;
 namespace OpenSim.Framework.Servers.HttpServer
 {
-    public delegate bool HasEventsMethod(UUID pId);
+    public delegate void RequestMethod(UUID requestID, Hashtable request);
+    public delegate bool HasEventsMethod(UUID requestID, UUID pId);
-    public delegate Hashtable GetEventsMethod(UUID pId, string request);
+    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
-    public delegate Hashtable NoEventsMethod();
+    public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
    public class PollServiceEventArgs : EventArgs
    {
        public HasEventsMethod HasEvents;
        public GetEventsMethod GetEvents;
        public NoEventsMethod NoEvents;
+        public RequestMethod Request;
        public UUID Id;
-        public PollServiceEventArgs(HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
+        public PollServiceEventArgs(RequestMethod pRequest, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
        {
+            Request = pRequest;
            HasEvents = pHasEvents;
            GetEvents = pGetEvents;
            NoEvents = pNoEvents;
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index ff7c1e8..553a7eb 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -27,6 +27,7 @@
 using System;
 using HttpServer;
+using OpenMetaverse;
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -37,12 +38,14 @@ namespace OpenSim.Framework.Servers.HttpServer
        public readonly IHttpClientContext HttpContext;
        public readonly IHttpRequest Request;
        public readonly int RequestTime;
+        public readonly UUID RequestID;
        public PollServiceHttpRequest(PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest)
        {
            PollServiceArgs = pPollServiceArgs;
            HttpContext = pHttpContext;
            Request = pRequest;
            RequestTime = System.Environment.TickCount;
+            RequestID = UUID.Random();
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 4020190..1c54581 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            foreach (object o in m_requests)
            {
                PollServiceHttpRequest req = (PollServiceHttpRequest) o;
-                m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
+                m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
            }
            m_requests.Clear();
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 41fb376..ce32443 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -100,11 +100,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                PollServiceHttpRequest req = m_request.Dequeue();
                try
                {
-                    if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id))
+                    if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                    {
                        StreamReader str = new StreamReader(req.Request.Body);
-                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
+                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
                        m_server.DoHTTPGruntWork(responsedata,
                                                 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                    }
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    {
                        if ((Environment.TickCount - req.RequestTime) > m_timeout)
                        {
-                            m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(),
+                            m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
                                                     new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                        }
                        else
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
new file mode 100644
index 0000000..a0d4008
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
@@ -0,0 +1,95 @@
+/*
+ * 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.IO;
+using System.Net;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+namespace OpenSim.Framework.Servers.HttpServer
+{
+    public class SynchronousRestFormsRequester
+    {
+        /// <summary>
+        /// Perform a synchronous REST request.
+        /// </summary>
+        /// <param name="verb"></param>
+        /// <param name="requestUrl"></param>
+        /// <param name="obj"> </param>
+        /// <returns></returns>
+        ///
+        /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
+        /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
+        public static string MakeRequest(string verb, string requestUrl, string obj)
+        {
+            WebRequest request = WebRequest.Create(requestUrl);
+            request.Method = verb;
+            if ((verb == "POST") || (verb == "PUT"))
+            {
+                request.ContentType = "text/www-form-urlencoded";
+                MemoryStream buffer = new MemoryStream();
+                int length = 0;
+                using (StreamWriter writer = new StreamWriter(buffer))
+                {
+                    writer.Write(obj);
+                    writer.Flush();
+                }
+                length = (int)obj.Length;
+                request.ContentLength = length;
+                Stream requestStream = request.GetRequestStream();
+                requestStream.Write(buffer.ToArray(), 0, length);
+            }
+            string respstring = String.Empty;
+            try
+            {
+                using (WebResponse resp = request.GetResponse())
+                {
+                    if (resp.ContentLength > 0)
+                    {
+                        using (StreamReader reader = new StreamReader(resp.GetResponseStream()))
+                        {
+                            respstring = reader.ReadToEnd();
+                        }
+                    }
+                }
+            }
+            catch (System.InvalidOperationException)
+            {
+                // This is what happens when there is invalid XML
+            }
+            return respstring;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
deleted file mode 100644
index 8bf406c..0000000
--- a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
+++ /dev/null
@@ -1,72 +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.IO;
-using System.Reflection;
-using System.Xml.Serialization;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
-namespace OpenSim.Framework.Servers
-{
-    public class PostAssetStreamHandler : BaseStreamHandler
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        // private OpenAsset_Main m_assetManager;
-        private IAssetDataPlugin m_assetProvider;
-        public override byte[] Handle(string path, Stream request,
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-        {
-            string param = GetParam(path);
-            UUID assetId;
-            if (param.Length > 0)
-                UUID.TryParse(param, out assetId);
-            // byte[] txBuffer = new byte[4096];
-            XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
-            AssetBase asset = (AssetBase) xs.Deserialize(request);
-            m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
-            m_assetProvider.StoreAsset(asset);
-            return new byte[] {};
-        }
-        public PostAssetStreamHandler(IAssetDataPlugin assetProvider)
-            : base("POST", "/assets")
-        {
-            // m_assetManager = assetManager;
-            m_assetProvider = assetProvider;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
deleted file mode 100644
index be3f518..0000000
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ /dev/null
@@ -1,135 +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;
-using System.Collections.Generic;
-using System.Net;
-using System.Text;
-using HttpServer;
-using NUnit.Framework;
-using OpenSim.Data;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
-namespace OpenSim.Framework.Servers.Tests
-{
-    [TestFixture]
-    public class GetAssetStreamHandlerTests
-    {
-        private const string ASSETS_PATH = "/assets";
-        [Test]
-        public void TestConstructor()
-        {
-            TestHelper.InMethod();
-            // GetAssetStreamHandler handler = 
-            new GetAssetStreamHandler(null);
-        }
-        [Test]
-        public void TestGetParams()
-        {
-            TestHelper.InMethod();
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH);
-        }
-        [Test]
-        public void TestSplitParams()
-        {
-            TestHelper.InMethod();
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);
-        }
-        [Test]
-        public void TestHandleNoParams()
-        {
-            TestHelper.InMethod();
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH);
-        }
-        [Test]
-        public void TestHandleMalformedGuid()
-        {
-            TestHelper.InMethod();
-            GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
-            BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH);
-        }
-        [Test]
-        public void TestHandleFetchMissingAsset()
-        {
-            GetAssetStreamHandler handler;
-            OSHttpResponse response;
-            CreateTestEnvironment(out handler, out response);
-            GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response);
-        }
-        [Test]
-        public void TestHandleFetchExistingAssetData()
-        {
-            GetAssetStreamHandler handler;
-            OSHttpResponse response;
-            AssetBase asset = CreateTestEnvironment(out handler, out response);
-            GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response);
-        }
-        [Test]
-        public void TestHandleFetchExistingAssetXml()
-        {
-            GetAssetStreamHandler handler;
-            OSHttpResponse response;
-            AssetBase asset = CreateTestEnvironment(out handler, out response);
-            GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetXmlTest(asset, handler, response);
-        }
-        private static AssetBase CreateTestEnvironment(out GetAssetStreamHandler handler, out OSHttpResponse response)
-        {
-            AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
-            IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin();
-            handler = new GetAssetStreamHandler(assetDataPlugin);
-            assetDataPlugin.StoreAsset(asset);
-            return asset;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 743ca69..8900e46 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
    public class VersionInfo
    {
-        private const string VERSION_NUMBER = "0.6.6";
+        private const string VERSION_NUMBER = "0.6.8";
        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
        public enum Flavour
@@ -67,8 +67,8 @@ namespace OpenSim
        /// 
        /// Having this version number allows the grid service to reject connections from regions running a version
        /// of the code that is too old. 
-        ///   
+        ///
        /// </value>
-        public readonly static int MajorInterfaceVersion = 5;
+        public readonly static int MajorInterfaceVersion = 6;
    }
 }
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index 084964d..3d8f32f 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -35,9 +35,9 @@ namespace OpenSim.Framework
    /// 
    /// TODO: This looks very much like the OpenMetaverse SimStatsPacket.  It should be much more generic stats
    /// storage.
-    /// </summary>        
+    /// </summary>
    public class SimStats
-    {                 
+    {
        public uint RegionX
        {
            get { return m_regionX; }
@@ -47,25 +47,25 @@ namespace OpenSim.Framework
        public uint RegionY
        {
            get { return m_regionY; }
-        }        
+        }
        private uint m_regionY;
        
        public SimStatsPacket.RegionBlock RegionBlock
        {
            get { return m_regionBlock; }
-        }                
+        }
        private SimStatsPacket.RegionBlock m_regionBlock;
        
        public SimStatsPacket.StatBlock[] StatsBlock
        {
            get { return m_statsBlock; }
-        }        
+        }
        private SimStatsPacket.StatBlock[] m_statsBlock;
        
        public uint RegionFlags
        {
            get { return m_regionFlags; }
-        }        
+        }
        private uint m_regionFlags;
            
        public uint ObjectCapacity
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
        public UUID RegionUUID
        {
-            get { return regionUUID;}   
+            get { return regionUUID; }
        }
        private UUID regionUUID;
                
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 946d7f5..25ae6b0 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
    /// A dictionary for task inventory.
    /// </summary>
    /// This class is not thread safe.  Callers must synchronize on Dictionary methods or Clone() this object before
-    /// iterating over it.    
+    /// iterating over it.
    public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>,
                                           ICloneable, IXmlSerializable
    {
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index fa6f0b8..d3a239d 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework
        }
        private static void ThreadTrackerThreadLoop()
-        {            
+        {
            try
            {
                while (true)
@@ -70,8 +70,8 @@ namespace OpenSim.Framework
            {
                m_log.ErrorFormat(
                    "[THREAD TRACKER]: Thread tracker cleanup thread terminating with exception.  Please report this error.  Exception is {0}", 
-                    e);                
+                    e);
-            }                
+            }
        }
        public static void Add(Thread thread)
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 16f265c..0fa82cf 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework
            m_configMember.addConfigurationOption("library_location",
                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                "Path to library control file",
-                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);            
+                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);
            
            m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index f51a199..413f152 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -217,7 +217,7 @@ namespace OpenSim.Framework
        public string Name
        {
            get { return String.Format("{0} {1}", m_firstname, m_surname); }
-        }        
+        }
        public string Email
        {
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 58344f3..17fc58c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
    /// </summary>
    public class Util
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);       
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private static uint nextXferID = 5000;
        private static Random randomClass = new Random();
@@ -70,6 +70,39 @@ namespace OpenSim.Framework
        public static readonly Regex UUIDPattern 
            = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
        
+        /// <summary>
+        /// Linear interpolates B<->C using percent A
+        /// </summary>
+        /// <param name="a"></param>
+        /// <param name="b"></param>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        public static double lerp(double a, double b, double c)
+        {
+            return (b*a) + (c*(1 - a));
+        }
+        /// <summary>
+        /// Bilinear Interpolate, see Lerp but for 2D using 'percents' X & Y.
+        /// Layout:
+        ///     A B
+        ///     C D
+        /// A<->C = Y
+        /// C<->D = X
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <param name="a"></param>
+        /// <param name="b"></param>
+        /// <param name="c"></param>
+        /// <param name="d"></param>
+        /// <returns></returns>
+        public static double lerp2D(double x, double y, double a, double b, double c, double d)
+        {
+            return lerp(y, lerp(x, a, b), lerp(x, c, d));
+        }
        /// <value>
        /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
        /// </value>
@@ -103,7 +136,7 @@ namespace OpenSim.Framework
            float dx = a.X - b.X;
            float dy = a.Y - b.Y;
            float dz = a.Z - b.Z;
-            return (dx*dx + dy*dy + dz*dz) < (amount*amount);           
+            return (dx*dx + dy*dy + dz*dz) < (amount*amount);
        }
        /// <summary>
@@ -942,7 +975,7 @@ namespace OpenSim.Framework
            else
            {
                os = ReadEtcIssue();
-            }         
+            }
                      
            if (os.Length > 45)
            {
@@ -1170,6 +1203,32 @@ namespace OpenSim.Framework
            return found.ToArray();
        }
+        public static string ServerURI(string uri)
+        {
+            if (uri == string.Empty)
+                return string.Empty;
+            // Get rid of eventual slashes at the end
+            uri = uri.TrimEnd('/');
+            IPAddress ipaddr1 = null;
+            string port1 = "";
+            try
+            {
+                ipaddr1 = Util.GetHostFromURL(uri);
+            }
+            catch { }
+            try
+            {
+                port1 = uri.Split(new char[] { ':' })[2];
+            }
+            catch { }
+            // We tried our best to convert the domain names to IP addresses
+            return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;
+        }
        #region FireAndForget Threading Pattern
        public static void FireAndForget(System.Threading.WaitCallback callback)
author	John Hurliman	2009-09-30 15:28:23 -0700
committer	John Hurliman	2009-09-30 15:28:23 -0700
commit	acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch)
tree	305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Framework
parent	* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff)
parent	Formatting cleanup. (diff)
download	opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz