diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-04 11:21:14 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-04 11:21:14 -0800 |
| commit | 96fd9253490cd35dca314d7719529b886a3df3ae (patch) | |
| tree | 87207b5070f28ecdc8a38610d00c9c84e2bcb5f2 /indra/newview/llfloaterpreference.cpp | |
| parent | d0cd8f94db7e9ff5135b05c86fdccc007317d89a (diff) | |
| parent | 462a49fb9dcf9eb9f7d6b438bebabb7dc773c683 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 780393a9c0..224514dd48 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -985,7 +985,8 @@ void LLFloaterPreference::cleanupBadSetting() if (gSavedPerAccountSettings.getString("BusyModeResponse2") == "|TOKEN COPY BusyModeResponse|") { llwarns << "cleaning old BusyModeResponse" << llendl; - gSavedPerAccountSettings.setString("BusyModeResponse2", gSavedPerAccountSettings.getText("BusyModeResponse")); + //LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885) + gSavedPerAccountSettings.setString("BusyModeResponse2", LLTrans::getString("BusyModeResponseDefault")); } } |