merge changes for 3.8.0-release

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index c3f0e92cb0..15f2354552 100755
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -32,9 +32,23 @@
 #include "lltut.h"
 #include "../lluicolortable.h"
 #include "../llrender/lluiimage.h"
+#include "../llmessage/llexperiencecache.h"
 
 #include <boost/regex.hpp>
 
+
+namespace LLExperienceCache
+{
+    const LLSD& get( const LLUUID& key)
+    {
+		static LLSD boo;
+        return boo;
+    }
+
+    void get( const LLUUID& key, callback_slot_t slot ){}
+
+}
+
 typedef std::map<std::string, LLControlGroup*> settings_map_t;
 settings_map_t LLUI::sSettingGroups;