diff options
author | Diva Canto | 2010-01-13 09:17:30 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-13 09:17:30 -0800 |
commit | 7356860b487febd12c2e0de2f009a6df9ea0aeec (patch) | |
tree | 801eaa0c90483cca8a07f2b4f9f30bf16be84f62 /OpenSim/Server/Handlers/UserAccounts | |
parent | More appearance woes fixed, this time for child agents. Tested on a grid with... (diff) | |
download | opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.zip opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.gz opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.bz2 opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.xz |
Several more buglets removed.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index b54b63e..6a82165 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
68 | //httpRequest.Headers["authorization"] ... | 68 | //httpRequest.Headers["authorization"] ... |
69 | 69 | ||
70 | //m_log.DebugFormat("[XXX]: query String: {0}", body); | 70 | //m_log.DebugFormat("[XXX]: query String: {0}", body); |
71 | 71 | string method = string.Empty; | |
72 | try | 72 | try |
73 | { | 73 | { |
74 | Dictionary<string, object> request = | 74 | Dictionary<string, object> request = |
@@ -77,7 +77,7 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
77 | if (!request.ContainsKey("METHOD")) | 77 | if (!request.ContainsKey("METHOD")) |
78 | return FailureResult(); | 78 | return FailureResult(); |
79 | 79 | ||
80 | string method = request["METHOD"].ToString(); | 80 | method = request["METHOD"].ToString(); |
81 | 81 | ||
82 | switch (method) | 82 | switch (method) |
83 | { | 83 | { |
@@ -88,11 +88,11 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
88 | case "setaccount": | 88 | case "setaccount": |
89 | return StoreAccount(request); | 89 | return StoreAccount(request); |
90 | } | 90 | } |
91 | m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method); | 91 | m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); |
92 | } | 92 | } |
93 | catch (Exception e) | 93 | catch (Exception e) |
94 | { | 94 | { |
95 | m_log.Debug("[PRESENCE HANDLER]: Exception {0}" + e); | 95 | m_log.DebugFormat("[USER SERVICE HANDLER]: Exception in method {0}: {1}", method, e); |
96 | } | 96 | } |
97 | 97 | ||
98 | return FailureResult(); | 98 | return FailureResult(); |
@@ -134,7 +134,9 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
134 | if (account == null) | 134 | if (account == null) |
135 | result["result"] = "null"; | 135 | result["result"] = "null"; |
136 | else | 136 | else |
137 | { | ||
137 | result["result"] = account.ToKeyValuePairs(); | 138 | result["result"] = account.ToKeyValuePairs(); |
139 | } | ||
138 | 140 | ||
139 | return ResultToBytes(result); | 141 | return ResultToBytes(result); |
140 | } | 142 | } |
@@ -247,7 +249,6 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
247 | private byte[] ResultToBytes(Dictionary<string, object> result) | 249 | private byte[] ResultToBytes(Dictionary<string, object> result) |
248 | { | 250 | { |
249 | string xmlString = ServerUtils.BuildXmlResponse(result); | 251 | string xmlString = ServerUtils.BuildXmlResponse(result); |
250 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); | ||
251 | UTF8Encoding encoding = new UTF8Encoding(); | 252 | UTF8Encoding encoding = new UTF8Encoding(); |
252 | return encoding.GetBytes(xmlString); | 253 | return encoding.GetBytes(xmlString); |
253 | } | 254 | } |