diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-08 17:35:18 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-08 17:35:18 -0400 |
| commit | 1fce3cc89eca7edf05ef550707e955af3d4d5fc7 (patch) | |
| tree | 96d70412eba42fd939c75f094d45cbbcb68b5ef8 | |
| parent | 949942c730b0b7463338c2cb3bc411ac12f4f648 (diff) | |
corrections needed for new tools
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llexperiencelog.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpanelexperiencepicker.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8185c7c2aa..a2aee2e000 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 7b594577db..ec6134a4b3 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 b7c0f3b1fb..70d826a407 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() |