summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-10-11 13:41:30 -0400
committerOz Linden <oz@lindenlab.com>2017-10-11 13:41:30 -0400
commit69c6d6fc6305e7640c2a5523fecf258d0daebe4b (patch)
treeebc0dec57586c5aaa2673ab4af8fe24a7b869b6d /indra/newview
parentd62ad1ef8afc1b9abadbc611d373a7a7d9afc368 (diff)
remove code duplicated in merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lllogininstance.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index fe7751473a..77eadef716 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -633,19 +633,6 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia
request_params[it->first] = it->second;
}
- // log request_params _before_ adding the credentials
- LL_DEBUGS("LLLogin") << "Login parameters: " << LLSDOStreamer<LLSDNotationFormatter>(request_params) << LL_ENDL;
-
- // Copy the credentials into the request after logging the rest
- LLSD credentials(user_credential->getLoginParams());
- for (LLSD::map_const_iterator it = credentials.beginMap();
- it != credentials.endMap();
- it++
- )
- {
- request_params[it->first] = it->second;
- }
-
// Specify desired timeout/retry options
LLSD http_params;
http_params["timeout"] = gSavedSettings.getF32("LoginSRVTimeout");