diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
commit | 1e050c2ed87ae2093623fa4c66a69aeee1fb980c (patch) | |
tree | ff9bf66608dc3b9c4459daa68ec99a3065182aac /indra/llui/tests | |
parent | 36954908632d6f5366f6517023676c1bcd71aa17 (diff) | |
parent | d276950c8d4d53f9d5d6497d5a4a4582c499938a (diff) |
merge
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(); |