From 5ecbe9be9057e37e1fead4f03e32be3bb479b4cb Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 5 May 2010 00:29:27 -0700
Subject: Fixed default snapshot subject line showing up as [GRID_NAME]

---
 linden/indra/newview/llfloaterpostcard.cpp | 8 ++++++--
 1 file 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
 		if((childGetValue("subject_form").asString()).empty())
 		{
 			// Stuff the subject back into the form.
-			childSetTextArg("default_subject", "[GRID_NAME]", gHippoGridManager->getConnectedGrid()->getGridName());
-			childSetValue("subject_form", getString("default_subject"));
+			LLStringUtil::format_map_t targs;
+			targs["[GRID_NAME]"] = gHippoGridManager->getConnectedGrid()->getGridName();
+			std::string subj = getString("default_subject");
+			LLStringUtil::format(subj, targs);
+
+			childSetValue("subject_form", subj);
 		}
 
 		if(!mHasFirstMsgFocus)
-- 
cgit v1.1