diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
commit | 27f11d9868bc72e7096ae6266af1c6c9318c545e (patch) | |
tree | 12190521b6870891072e312c8b3e8864721aa075 /indra/llui/tests/llurlentry_test.cpp | |
parent | fbab245e487650d6420c9fe33cf07123af12f422 (diff) | |
parent | dd06d42c09e5e1f4b28559059ec8393e53f767a7 (diff) |
merge
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
-rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 5c6623da61..59c0826ad7 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -27,6 +27,7 @@ #include "linden_common.h" #include "../llurlentry.h" +#include "../lluictrl.h" #include "llurlentry_stub.cpp" #include "lltut.h" #include "../lluicolortable.h" @@ -34,6 +35,14 @@ #include <boost/regex.hpp> +typedef std::map<std::string, LLControlGroup*> settings_map_t; +settings_map_t LLUI::sSettingGroups; + +BOOL LLControlGroup::getBOOL(const std::string& name) +{ + return false; +} + LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& default_color) const { return LLUIColor(); |