diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 8185c7c2aa7730bd437c2dd88598e5aacb79f3f3..a2aee2e000ef4717bb635418b3b3aee1594763eb 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4705,7 +4705,7 @@ void LLAppViewer::saveExperienceCache()
 	std::string filename =
 		gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
 	LL_INFOS("ExperienceCache") << "Saving " << filename << LL_ENDL;
-	llofstream cache_stream(filename);
+	llofstream cache_stream(filename.c_str());
 	if(cache_stream.is_open())
 	{
 		LLExperienceCache::exportFile(cache_stream);
@@ -4717,7 +4717,7 @@ void LLAppViewer::loadExperienceCache()
 	std::string filename =
 		gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
 	LL_INFOS("ExperienceCache") << "Loading " << filename << LL_ENDL;
-	llifstream cache_stream(filename);
+	llifstream cache_stream(filename.c_str());
 	if(cache_stream.is_open())
 	{
 		LLExperienceCache::importFile(cache_stream);
diff --git a/indra/newview/llexperiencelog.cpp b/indra/newview/llexperiencelog.cpp
index 7b594577db4ff8b968a2a77b6c7931cd02dd6bd9..ec6134a4b36f63b5a2fb25a84bf827f7f6a20206 100644
--- a/indra/newview/llexperiencelog.cpp
+++ b/indra/newview/llexperiencelog.cpp
@@ -188,7 +188,7 @@ void LLExperienceLog::saveEvents()
 	settings["Notify"] = mNotifyNewEvent;
 	settings["PageSize"] = (int)mPageSize;
 
-	llofstream stream(filename);
+	llofstream stream(filename.c_str());
 	LLSDSerialize::toPrettyXML(settings, stream);
 }
 
@@ -198,7 +198,7 @@ void LLExperienceLog::loadEvents()
 	LLSD settings = LLSD::emptyMap();
 
 	std::string filename = getFilename();
-	llifstream stream(filename);
+	llifstream stream(filename.c_str());
 	LLSDSerialize::fromXMLDocument(settings, stream);
 
 	if(settings.has("MaxDays"))
diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp
index b7c0f3b1fb84aefe74a6b647e3de124fb828d74e..70d826a407f8d7e8e731df07a51fc45669211405 100644
--- a/indra/newview/llpanelexperiencepicker.cpp
+++ b/indra/newview/llpanelexperiencepicker.cpp
@@ -141,7 +141,7 @@ BOOL LLPanelExperiencePicker::postBuild()
 
 void LLPanelExperiencePicker::editKeystroke( class LLLineEditor* caller, void* user_data )
 {
-	getChildView(BTN_FIND)->setEnabled(caller->getText().size() >= 0);
+	getChildView(BTN_FIND)->setEnabled(true);
 }
 
 void LLPanelExperiencePicker::onBtnFind()