diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-26 10:03:28 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-26 10:03:28 -0400 |
commit | d45995b80d6d90aad6714adf3237dc44589169ea (patch) | |
tree | abf7bbd86f5316fce69341fb2ce395dd63101513 /indra/newview/tests | |
parent | 6f009080b9f8c9b5211288f6fe29cb326ac8bf23 (diff) | |
parent | c7141025c85ebabc0447a7d7c6f580c2e6c47f74 (diff) |
merge changes for storm-1568
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/llsechandler_basic_test.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index daa10819fc..0235400976 100644 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -86,6 +86,9 @@ std::string LLControlGroup::getString(const std::string& name) return ""; } +// Stub for --no-verify-ssl-cert +BOOL LLControlGroup::getBOOL(const std::string& name) { return FALSE; } + LLSD LLCredential::getLoginParams() { LLSD result = LLSD::emptyMap(); |