7 files changed, 51 insertions, 42 deletions

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index b652299..57ca704 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -244,7 +244,6 @@ namespace OpenSim.Framework.Communications.Services
                             InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
                             ArrayList InventoryRoot = new ArrayList();
                             InventoryRoot.Add(InventoryRootHash);
-                            userProfile.RootInventoryFolderID = inventData.RootFolderID;
 
                             logResponse.InventoryRoot = InventoryRoot;
                             logResponse.InventorySkeleton = AgentInventoryArray;
@@ -501,7 +500,6 @@ namespace OpenSim.Framework.Communications.Services
                         InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
                         ArrayList InventoryRoot = new ArrayList();
                         InventoryRoot.Add(InventoryRootHash);
-                        userProfile.RootInventoryFolderID = inventData.RootFolderID;
 
 
                         // Inventory Library Section
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index bf4f331..4f0af06 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -697,9 +697,6 @@ namespace OpenSim.Framework.Communications
                     // local service (standalone)
                     m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory");
                     m_InventoryService.CreateUserInventory(userProf.ID);
-                    InventoryFolderBase rootfolder = m_InventoryService.GetRootFolder(userProf.ID);
-                    if (rootfolder != null)
-                        userProf.RootInventoryFolderID = rootfolder.ID;
                 }
                 else if (m_commsManager.InterServiceInventoryService != null)
                 {
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index bec5ed3..75cdeb4 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -724,12 +724,20 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
                         catch(Exception e)
                         {
+                            string errorMessage
+                                = String.Format(
+                                    "Requested method [{0}] from {1} threw exception: {2} {3}",
+                                    methodName, request.RemoteIPEndPoint.Address, e.Message, e.StackTrace);
+
+                            m_log.ErrorFormat("[BASE HTTP SERVER]: {0}", errorMessage);
+
                             // if the registered XmlRpc method threw an exception, we pass a fault-code along
                             xmlRpcResponse = new XmlRpcResponse();
+
                             // Code probably set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
-                            xmlRpcResponse.SetFault(-32603, String.Format("Requested method [{0}] threw exception: {1}",
-                                                                          methodName, e.Message));
+                            xmlRpcResponse.SetFault(-32603, errorMessage);                            
                         }
+
                         // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here
                         response.KeepAlive = m_rpcHandlersKeepAlive[methodName];
                     }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index c53160f..bcfb0a4 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -188,7 +188,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                 try
                 {
                     IPAddress addr = IPAddress.Parse(req.Headers["remote_addr"]);
-                    int port = Int32.Parse(req.Headers["remote_port"]);
+                    // sometimes req.Headers["remote_port"] returns a comma separated list, so use
+                    // the first one in the list and log it 
+                    string[] strPorts = req.Headers["remote_port"].Split(new char[] { ',' });
+                    if (strPorts.Length > 1)
+                    {
+                        _log.ErrorFormat("[OSHttpRequest]: format exception on addr/port {0}:{1}, ignoring",
+                                     req.Headers["remote_addr"], req.Headers["remote_port"]);
+                    }
+                    int port = Int32.Parse(strPorts[0]);
                     _remoteIPEndPoint = new IPEndPoint(addr, port);
                 }
                 catch (FormatException)
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index efe5f0c..4b9a509 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -109,7 +109,10 @@ namespace OpenSim.Framework
             }
             else
             {
-                m_itemLock.ExitReadLock();
+                if (m_itemLock.RecursiveReadCount>0)
+                {
+                    m_itemLock.ExitReadLock();
+                }
             }
         }
 
@@ -144,7 +147,10 @@ namespace OpenSim.Framework
             }
             else
             {
-                m_itemLock.ExitWriteLock();
+                if (m_itemLock.RecursiveWriteCount > 0)
+                {
+                    m_itemLock.ExitWriteLock();
+                }
             }
         }
 
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 413f152..9bac739 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -119,8 +119,6 @@ namespace OpenSim.Framework
         /// </summary>
         private string m_profileUrl;
 
-        private UUID m_rootInventoryFolderId;
-
         /// <summary>
         /// The second component of a users account name
         /// </summary>
@@ -312,12 +310,6 @@ namespace OpenSim.Framework
             set { m_lastLogin = value; }
         }
 
-        public UUID RootInventoryFolderID
-        {
-            get { return m_rootInventoryFolderId; }
-            set { m_rootInventoryFolderId = value; }
-        }
-
         public string UserInventoryURI
         {
             get { return m_userInventoryUri; }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 7b90239..b5e2872 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1389,30 +1389,30 @@ namespace OpenSim.Framework
             return null;
         }
 
-        #endregion FireAndForget Threading Pattern

-        /// <summary>

-        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive

-        /// and negative every 24.9 days. This trims down TickCount so it doesn't wrap

-        /// for the callers. 

-        /// This trims it to a 12 day interval so don't let your frame time get too long.

-        /// </summary>

-        /// <returns></returns>

-        public static Int32 EnvironmentTickCount()

-        {

-            return Environment.TickCount & EnvironmentTickCountMask;

-        }

-        const Int32 EnvironmentTickCountMask = 0x3fffffff;

-

-        /// <summary>

-        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive

-        /// and negative every 24.9 days. Subtracts the passed value (previously fetched by

-        /// 'EnvironmentTickCount()') and accounts for any wrapping.

-        /// </summary>

-        /// <returns>subtraction of passed prevValue from current Environment.TickCount</returns>

-        public static Int32 EnvironmentTickCountSubtract(Int32 prevValue)

-        {

-            Int32 diff = EnvironmentTickCount() - prevValue;

-            return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1);

+        #endregion FireAndForget Threading Pattern
+        /// <summary>
+        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
+        /// and negative every 24.9 days. This trims down TickCount so it doesn't wrap
+        /// for the callers. 
+        /// This trims it to a 12 day interval so don't let your frame time get too long.
+        /// </summary>
+        /// <returns></returns>
+        public static Int32 EnvironmentTickCount()
+        {
+            return Environment.TickCount & EnvironmentTickCountMask;
+        }
+        const Int32 EnvironmentTickCountMask = 0x3fffffff;
+
+        /// <summary>
+        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
+        /// and negative every 24.9 days. Subtracts the passed value (previously fetched by
+        /// 'EnvironmentTickCount()') and accounts for any wrapping.
+        /// </summary>
+        /// <returns>subtraction of passed prevValue from current Environment.TickCount</returns>
+        public static Int32 EnvironmentTickCountSubtract(Int32 prevValue)
+        {
+            Int32 diff = EnvironmentTickCount() - prevValue;
+            return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1);
         }
     }
 }