Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2 files changed, 12 insertions, 1 deletions

diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index 8048f86..ed62f95 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -73,6 +73,18 @@ namespace OpenSim.Server.Handlers.Login
 
             if (requestData != null)
             {
+                foreach (string key in requestData.Keys)
+                {
+                    object value = requestData[key];
+                    Console.WriteLine("{0}:{1}", key, value);
+                    if (value is ArrayList)
+                    {
+                        ICollection col = value as ICollection;
+                        foreach (object item in col)
+                            Console.WriteLine("  {0}", item);
+                    }
+                }
+
                 if (requestData.ContainsKey("first") && requestData["first"] != null &&
                     requestData.ContainsKey("last") && requestData["last"] != null && (
                         (requestData.ContainsKey("passwd") && requestData["passwd"] != null) ||
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
index 16c93c8..9a7ad34 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
@@ -94,6 +94,5 @@ namespace OpenSim.Server.Handlers.Login
             server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false);
             server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin);
         }
-
     }
 }