diff options
author | Justin Clark-Casey (justincc) | 2012-03-22 22:17:07 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-22 22:17:07 +0000 |
commit | c4b2d24f337eeaf8c7d8e643c3491d491d584cde (patch) | |
tree | 2fb1d6b8dee1c2c278492dca742c4ed69a9341c0 /OpenSim/Server/Handlers | |
parent | Added new simple_build_permissions config to the .ini and .example files. (diff) | |
download | opensim-SC_OLD-c4b2d24f337eeaf8c7d8e643c3491d491d584cde.zip opensim-SC_OLD-c4b2d24f337eeaf8c7d8e643c3491d491d584cde.tar.gz opensim-SC_OLD-c4b2d24f337eeaf8c7d8e643c3491d491d584cde.tar.bz2 opensim-SC_OLD-c4b2d24f337eeaf8c7d8e643c3491d491d584cde.tar.xz |
Add llGiveInventory() test from object to object where both objects are owned by the same user.
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 12 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs | 1 |
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 | |||
73 | 73 | ||
74 | if (requestData != null) | 74 | if (requestData != null) |
75 | { | 75 | { |
76 | foreach (string key in requestData.Keys) | ||
77 | { | ||
78 | object value = requestData[key]; | ||
79 | Console.WriteLine("{0}:{1}", key, value); | ||
80 | if (value is ArrayList) | ||
81 | { | ||
82 | ICollection col = value as ICollection; | ||
83 | foreach (object item in col) | ||
84 | Console.WriteLine(" {0}", item); | ||
85 | } | ||
86 | } | ||
87 | |||
76 | if (requestData.ContainsKey("first") && requestData["first"] != null && | 88 | if (requestData.ContainsKey("first") && requestData["first"] != null && |
77 | requestData.ContainsKey("last") && requestData["last"] != null && ( | 89 | requestData.ContainsKey("last") && requestData["last"] != null && ( |
78 | (requestData.ContainsKey("passwd") && requestData["passwd"] != null) || | 90 | (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 | } |