diff options
| author | McCabe Maxsted | 2010-05-05 00:29:27 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-05-05 16:28:54 -0500 |
| commit | 5ecbe9be9057e37e1fead4f03e32be3bb479b4cb (patch) | |
| tree | 1b3910d593b6c335bfd963a25a3a0b8f48cf07fe /linden/indra | |
| parent | Made the 'Imprudence' label in the progress bar big, because we're awesome li... (diff) | |
| download | meta-impy-5ecbe9be9057e37e1fead4f03e32be3bb479b4cb.zip meta-impy-5ecbe9be9057e37e1fead4f03e32be3bb479b4cb.tar.gz meta-impy-5ecbe9be9057e37e1fead4f03e32be3bb479b4cb.tar.bz2 meta-impy-5ecbe9be9057e37e1fead4f03e32be3bb479b4cb.tar.xz | |
Fixed default snapshot subject line showing up as [GRID_NAME]
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llfloaterpostcard.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp index 41b6515..aa9b2fb 100644 --- a/linden/indra/newview/llfloaterpostcard.cpp +++ b/linden/indra/newview/llfloaterpostcard.cpp | |||
| @@ -357,8 +357,12 @@ bool LLFloaterPostcard::missingSubjMsgAlertCallback(const LLSD& notification, co | |||
| 357 | if((childGetValue("subject_form").asString()).empty()) | 357 | if((childGetValue("subject_form").asString()).empty()) |
| 358 | { | 358 | { |
| 359 | // Stuff the subject back into the form. | 359 | // Stuff the subject back into the form. |
| 360 | childSetTextArg("default_subject", "[GRID_NAME]", gHippoGridManager->getConnectedGrid()->getGridName()); | 360 | LLStringUtil::format_map_t targs; |
| 361 | childSetValue("subject_form", getString("default_subject")); | 361 | targs["[GRID_NAME]"] = gHippoGridManager->getConnectedGrid()->getGridName(); |
| 362 | std::string subj = getString("default_subject"); | ||
| 363 | LLStringUtil::format(subj, targs); | ||
| 364 | |||
| 365 | childSetValue("subject_form", subj); | ||
| 362 | } | 366 | } |
| 363 | 367 | ||
| 364 | if(!mHasFirstMsgFocus) | 368 | if(!mHasFirstMsgFocus) |