diff --git a/indra/newview/llexperiencelog.cpp b/indra/newview/llexperiencelog.cpp
index f1e097f22d54e8cca1a90d2c56904e69dde6d521..7b594577db4ff8b968a2a77b6c7931cd02dd6bd9 100644
--- a/indra/newview/llexperiencelog.cpp
+++ b/indra/newview/llexperiencelog.cpp
@@ -53,7 +53,7 @@ class LLExperienceLogDispatchHandler : public LLDispatchHandler
 			std::istringstream llsdData(llsdRaw);
 			if (!LLSDSerialize::deserialize(message, llsdData, llsdRaw.length()))
 			{
-				llwarns << "LLExperienceLogDispatchHandler: Attempted to read parameter data into LLSD but failed:" << llsdRaw << llendl;
+				LL_WARNS() << "LLExperienceLogDispatchHandler: Attempted to read parameter data into LLSD but failed:" << llsdRaw << LL_ENDL;
 			}
 		}
 		message["public_id"] = invoice;
diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp
index 60a9bdfd988c3b1aa2b313e94e8847d6ad5b66e4..da65e502441b75694c3e69985f60ca42b76ec5a9 100644
--- a/indra/newview/llfloaterexperiencepicker.cpp
+++ b/indra/newview/llfloaterexperiencepicker.cpp
@@ -50,7 +50,7 @@ LLFloaterExperiencePicker* LLFloaterExperiencePicker::show( select_callback_t ca
 		LLFloaterReg::showTypedInstance<LLFloaterExperiencePicker>("experience_search", key);
 	if (!floater)
 	{
-		llwarns << "Cannot instantiate experience picker" << llendl;
+		LL_WARNS() << "Cannot instantiate experience picker" << LL_ENDL;
 		return NULL;
 	}
 
diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index f8b4978a3dffb2a0afdf4210e05e8d73e7fcb349..25433f814cd6dac553935300a44673c78d7fd6bf 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -140,7 +140,7 @@ class HandleResponder : public LLHTTPClient::Responder
 
     virtual void error(U32 status, const std::string& reason)
     {
-        llwarns << "HandleResponder failed with code: " << status<< ", reason: " << reason << llendl;
+        LL_WARNS() << "HandleResponder failed with code: " << status<< ", reason: " << reason << LL_ENDL;
     }
 };
 
@@ -768,7 +768,7 @@ void LLFloaterExperienceProfile::onSaveComplete( const LLSD& content )
 
     if(!content.has("experience_keys"))
     {
-        llwarns << "LLFloaterExperienceProfile::onSaveComplete called with bad content" << llendl;
+        LL_WARNS() << "LLFloaterExperienceProfile::onSaveComplete called with bad content" << LL_ENDL;
         return;
     }
 
@@ -777,13 +777,13 @@ void LLFloaterExperienceProfile::onSaveComplete( const LLSD& content )
     LLSD::array_const_iterator it = experiences.beginArray();
     if(it == experiences.endArray())
     {
-        llwarns << "LLFloaterExperienceProfile::onSaveComplete called with empty content" << llendl;
+        LL_WARNS() << "LLFloaterExperienceProfile::onSaveComplete called with empty content" << LL_ENDL;
         return;
     }
 
     if(!it->has(LLExperienceCache::EXPERIENCE_ID) || ((*it)[LLExperienceCache::EXPERIENCE_ID].asUUID() != id))
     {
-        llwarns << "LLFloaterExperienceProfile::onSaveComplete called with unexpected experience id" << llendl;
+        LL_WARNS() << "LLFloaterExperienceProfile::onSaveComplete called with unexpected experience id" << LL_ENDL;
         return;
     }
  
diff --git a/indra/newview/llfloaterexperiences.cpp b/indra/newview/llfloaterexperiences.cpp
index 51e3996f3fdb80532118d4af2407fce2e538ee39..2153079fa412d1a12e06a350b6b0cbab795c16a6 100644
--- a/indra/newview/llfloaterexperiences.cpp
+++ b/indra/newview/llfloaterexperiences.cpp
@@ -25,18 +25,20 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
-#include "llpanelexperiences.h"
 #include "llfloaterexperiences.h"
+
 #include "llagent.h"
-#include "llfloaterregioninfo.h"
-#include "lltabcontainer.h"
-#include "lltrans.h"
-#include "llexperiencecache.h"
 #include "llevents.h"
+#include "llexperiencecache.h"
+#include "llfloaterregioninfo.h"
+#include "llhttpclient.h"
 #include "llnotificationsutil.h"
 #include "llpanelexperiencelog.h"
 #include "llpanelexperiencepicker.h"
+#include "llpanelexperiences.h"
+#include "lltabcontainer.h"
+#include "lltrans.h"
+#include "llviewerregion.h"
 
 
 #define SHOW_RECENT_TAB (0)
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 244b1cbb9b5c70829587e9495ea3f092feffa470..6bfb31164a53392801a84602231d5ddb8716da00 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -3619,7 +3619,7 @@ class LLRegionExperienceResponder : public LLHTTPClient::Responder
 		}
 		else
 		{
-			llwarns << "experience responder failed [status:" << status << "]: " << content << llendl;
+			LL_WARNS() << "experience responder failed [status:" << status << "]: " << content << LL_ENDL;
 		}
 	}
 };
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 2cbf9bb8b62b91f479c41724580f7e155993e123..26643d8671aa12c2c896c400bdbdc98d1198b113 100755
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -702,7 +702,7 @@ void LLInventoryCategoriesObserver::changed(U32 mask)
 		LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
 		if (!category)
         {
-            llwarns << "Category : Category id = " << cat_id << " disappeared" << llendl;
+            LL_WARNS() << "Category : Category id = " << cat_id << " disappeared" << LL_ENDL;
 			cat_data.mCallback();
             // Keep track of those deleted categories so we can remove them
             deleted_categories_ids.push_back(cat_id);
diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp
index 8da41b59ddfc32ab022aa5c164cbbf20da56a3c9..5d8f3134d6353dd8bfefb26a736490b4a6763fbc 100644
--- a/indra/newview/llpanelexperiencepicker.cpp
+++ b/indra/newview/llpanelexperiencepicker.cpp
@@ -78,7 +78,7 @@ class LLExperienceSearchResponder : public LLHTTPClient::Responder
 		}
 		else
 		{
-			llwarns << "experience picker failed [status:" << status << "]: " << content << llendl;
+			LL_WARNS() << "experience picker failed [status:" << status << "]: " << content << LL_ENDL;
 
 		}
 	}
@@ -323,7 +323,7 @@ void LLPanelExperiencePicker::filterContent()
 	if (search_results->isEmpty())
 	{
 		LLStringUtil::format_map_t map;
-		std::string search_text = childGetText(TEXT_EDIT);
+		std::string search_text = getChild<LLUICtrl>(TEXT_EDIT)->getValue().asString();
 		map["[TEXT]"] = search_text;
 		if (search_text.empty())
 		{