diff options
| author | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
| commit | 5e56b2d4acaecf6b1c9e1789748b90836a7bd2c6 (patch) | |
| tree | fc6a18bce3c560e5a5fbd25b224cc0d9ab580628 /indra/newview/tests | |
| parent | b2028085fdfddfd5a7ac0f52d9f34b84457b3b98 (diff) | |
| parent | c89ff6e80be24f3c4c910b7f380ff587f5853455 (diff) | |
merge
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"); |