Merge for Xcode 7

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 15f2354552..ba1cc436f9 100755
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -37,17 +37,17 @@
 #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 ){}
-
-}
+// 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;