summaryrefslogtreecommitdiff
path: root/indra/llui/tests
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-11-15 15:52:54 -0800
committerRichard Linden <none@none>2010-11-15 15:52:54 -0800
commit50d21a75a7c6a41a5a3355a8c4406a33454c70dd (patch)
treee2fe3e855d710700cd956b505a3f0548038c9dac /indra/llui/tests
parente8e1d7e629b9a4a65cde766ed81334140a749428 (diff)
parent4bdac3f152862b257b9babe9b5a43329c9f544f9 (diff)
merge
Diffstat (limited to 'indra/llui/tests')
-rw-r--r--indra/llui/tests/llurlentry_test.cpp9
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();