diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-04 20:10:29 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-04 20:10:29 +0300 |
| commit | f3add82a4c7f34bfff285302c34d952902451cad (patch) | |
| tree | 2e02d64853c341d42efa098055dc5e4b65b84d72 /indra/newview/tests/llsecapi_test.cpp | |
| parent | 1a6eee4ea27923016fac790b47161ce00f2c9b4f (diff) | |
| parent | bc7e2fb7e7f7527b522bdf6f4c791f3b660485e2 (diff) | |
Merge branch master (D550) into DRTVWR-546
# Conflicts:
# indra/newview/llappviewer.h
Diffstat (limited to 'indra/newview/tests/llsecapi_test.cpp')
| -rw-r--r-- | indra/newview/tests/llsecapi_test.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/tests/llsecapi_test.cpp b/indra/newview/tests/llsecapi_test.cpp index 37fbbb449b..7d2a9a436f 100644 --- a/indra/newview/tests/llsecapi_test.cpp +++ b/indra/newview/tests/llsecapi_test.cpp @@ -62,6 +62,7 @@ LLPointer<LLCertificateStore> LLSecAPIBasicHandler::getCertificateStore(const st void LLSecAPIBasicHandler::setProtectedData(const std::string& data_type, const std::string& data_id, const LLSD& data) {} void LLSecAPIBasicHandler::addToProtectedMap(const std::string& data_type, const std::string& data_id, const std::string& map_elem, const LLSD& data) {} void LLSecAPIBasicHandler::removeFromProtectedMap(const std::string& data_type, const std::string& data_id, const std::string& map_elem) {} +void LLSecAPIBasicHandler::syncProtectedMap() {} LLSD LLSecAPIBasicHandler::getProtectedData(const std::string& data_type, const std::string& data_id) { return LLSD(); } void LLSecAPIBasicHandler::deleteProtectedData(const std::string& data_type, const std::string& data_id) {} LLPointer<LLCredential> LLSecAPIBasicHandler::createCredential(const std::string& grid, const LLSD& identifier, const LLSD& authenticator) { return NULL; } |