diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-31 01:58:09 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-31 01:58:09 +0300 |
| commit | 9b0569840f06137ee2379463f5028a5342c3555a (patch) | |
| tree | 279eaa517131fe4e073d8d9781e0b69e747a0bb9 /indra/newview/tests/lllogininstance_test.cpp | |
| parent | 1e09d25d9ce8b7ec8da28ad5364d81c0faab9d0a (diff) | |
| parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 7259e66265..a52c3dcef9 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -191,11 +191,6 @@ std::string LLGridManager::getGridId(const std::string& grid) return std::string(); } -//LLPointer<LLSecAPIHandler> getSecHandler(const std::string& handler_type) -//{ -// return nullptr; -//} - //----------------------------------------------------------------------------- #include "../llviewercontrol.h" LLControlGroup gSavedSettings("Global"); |