summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llslurl_test.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-03 13:35:33 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-03 13:35:33 +0100
commit6bff1b1444dca9c0230fd5996b9136cb2f76c8f1 (patch)
tree1945871fd38361534236096995d51fef9a5130ac /indra/newview/tests/llslurl_test.cpp
parent665274abad307e8c5fff38660e3cd7e9a912abe4 (diff)
parent48ccc7ccfbe3e94f9dd78ced588e0a76d03fe070 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/tests/llslurl_test.cpp')
-rw-r--r--indra/newview/tests/llslurl_test.cpp5
1 files changed, 5 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");