diff options
| author | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
| commit | 9a322d1b7a6ee5380f8724b33a20c56c9583f093 (patch) | |
| tree | 70ee8e942f30ac3ed2f371b60cfcba9adfd961c2 /indra/llui/tests | |
| parent | f4884faf3a020a718c611f34aa534e80d8a8b666 (diff) | |
| parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/llui/tests')
| -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(); |