diff options
author | Diva Canto | 2012-03-22 20:36:01 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-22 20:36:01 -0700 |
commit | 179c0f5f562ae9d6994dda3c6702a55a79872bda (patch) | |
tree | af09cf69626cc375ad73b1072399a41c7a578e87 /OpenSim/Server | |
parent | Added new simple_build_permissions config to the .ini and .example files. (diff) | |
parent | Comment out login parameters debug output accidentally included with c4b2d24 (diff) | |
download | opensim-SC_OLD-179c0f5f562ae9d6994dda3c6702a55a79872bda.zip opensim-SC_OLD-179c0f5f562ae9d6994dda3c6702a55a79872bda.tar.gz opensim-SC_OLD-179c0f5f562ae9d6994dda3c6702a55a79872bda.tar.bz2 opensim-SC_OLD-179c0f5f562ae9d6994dda3c6702a55a79872bda.tar.xz |
Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 14 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index 8048f86..f83a239 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | |||
@@ -73,6 +73,20 @@ namespace OpenSim.Server.Handlers.Login | |||
73 | 73 | ||
74 | if (requestData != null) | 74 | if (requestData != null) |
75 | { | 75 | { |
76 | // Debug code to show exactly what login parameters the viewer is sending us. | ||
77 | // TODO: Extract into a method that can be generally applied if one doesn't already exist. | ||
78 | // foreach (string key in requestData.Keys) | ||
79 | // { | ||
80 | // object value = requestData[key]; | ||
81 | // Console.WriteLine("{0}:{1}", key, value); | ||
82 | // if (value is ArrayList) | ||
83 | // { | ||
84 | // ICollection col = value as ICollection; | ||
85 | // foreach (object item in col) | ||
86 | // Console.WriteLine(" {0}", item); | ||
87 | // } | ||
88 | // } | ||
89 | |||
76 | if (requestData.ContainsKey("first") && requestData["first"] != null && | 90 | if (requestData.ContainsKey("first") && requestData["first"] != null && |
77 | requestData.ContainsKey("last") && requestData["last"] != null && ( | 91 | requestData.ContainsKey("last") && requestData["last"] != null && ( |
78 | (requestData.ContainsKey("passwd") && requestData["passwd"] != null) || | 92 | (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 | |||
94 | server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false); | 94 | server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false); |
95 | server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin); | 95 | server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin); |
96 | } | 96 | } |
97 | |||
98 | } | 97 | } |
99 | } | 98 | } |