diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-03 13:35:33 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-03 13:35:33 +0100 |
| commit | c89ff6e80be24f3c4c910b7f380ff587f5853455 (patch) | |
| tree | 1945871fd38361534236096995d51fef9a5130ac /indra/newview/tests | |
| parent | 332cf3d32a8ddd56ac56ce36686bdfdedae0f8eb (diff) | |
| parent | dd6d7dde7e27130b72693c4bea0661c6b01efff2 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llslurl_test.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/tests/llviewernetwork_test.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp index 803020dc7a..4db7efa090 100644 --- a/indra/newview/tests/llslurl_test.cpp +++ b/indra/newview/tests/llslurl_test.cpp @@ -79,6 +79,11 @@ LLSD LLControlGroup::getLLSD(const std::string& name) return LLSD(); } +LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name) +{ + ctrl_name_table_t::iterator iter = mNameTable.find(name); + return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second; +} LLControlGroup gSavedSettings("test"); diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp index 5fba5eb69c..98e4c994b0 100644 --- a/indra/newview/tests/llviewernetwork_test.cpp +++ b/indra/newview/tests/llviewernetwork_test.cpp @@ -79,6 +79,11 @@ LLSD LLControlGroup::getLLSD(const std::string& name) return LLSD(); } +LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name) +{ + ctrl_name_table_t::iterator iter = mNameTable.find(name); + return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second; +} LLControlGroup gSavedSettings("test"); |