ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
This commit is contained in:
Melanie
2012-03-22 23:05:58 +00:00
parent 9edf99703a 760010d6fb
commit ed67b698d3
8 changed files with 208 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
View File

@@ -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) ||

1
OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
View File

@@ -94,6 +94,5 @@ namespace OpenSim.Server.Handlers.Login
server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false);
server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin);
}
}
}