diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
| commit | 3aa12e85f04f0608da5df05b2cbb01685ef62944 (patch) | |
| tree | 02e78886d530c92e3eddf0f73f3eb7f8a5b641da /indra/llui/tests/llurlentry_test.cpp | |
| parent | bae83c7eac98229271a6baf4c961fe167c74a597 (diff) | |
| parent | a702b34394e4b38b27338eb6d68d22b498984118 (diff) | |
merge fix(es) for storm-378
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(); |