diff options
| author | Melanie | 2012-03-23 02:44:22 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-23 02:44:22 +0000 |
| commit | 2190a62366a633e93e2d4b0284962127f1a5cbf9 (patch) | |
| tree | 326b866b027bd57c8edf158a5514b13c4ad20768 /OpenSim/Server | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method... (diff) | |
| download | opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.zip opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.gz opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.bz2 opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index ed62f95..f83a239 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | |||
| @@ -73,17 +73,19 @@ namespace OpenSim.Server.Handlers.Login | |||
| 73 | 73 | ||
| 74 | if (requestData != null) | 74 | if (requestData != null) |
| 75 | { | 75 | { |
| 76 | foreach (string key in requestData.Keys) | 76 | // Debug code to show exactly what login parameters the viewer is sending us. |
| 77 | { | 77 | // TODO: Extract into a method that can be generally applied if one doesn't already exist. |
| 78 | object value = requestData[key]; | 78 | // foreach (string key in requestData.Keys) |
| 79 | Console.WriteLine("{0}:{1}", key, value); | 79 | // { |
| 80 | if (value is ArrayList) | 80 | // object value = requestData[key]; |
| 81 | { | 81 | // Console.WriteLine("{0}:{1}", key, value); |
| 82 | ICollection col = value as ICollection; | 82 | // if (value is ArrayList) |
| 83 | foreach (object item in col) | 83 | // { |
| 84 | Console.WriteLine(" {0}", item); | 84 | // ICollection col = value as ICollection; |
| 85 | } | 85 | // foreach (object item in col) |
| 86 | } | 86 | // Console.WriteLine(" {0}", item); |
| 87 | // } | ||
| 88 | // } | ||
| 87 | 89 | ||
| 88 | if (requestData.ContainsKey("first") && requestData["first"] != null && | 90 | if (requestData.ContainsKey("first") && requestData["first"] != null && |
| 89 | requestData.ContainsKey("last") && requestData["last"] != null && ( | 91 | requestData.ContainsKey("last") && requestData["last"] != null && ( |