svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

1 files changed, 4 insertions, 6 deletions

diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 95d2541fc5..0c3edf1242 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -355,8 +355,7 @@ void LLPanelClassified::initNewClassified()
 	// delay commit until user hits save
 	// sendClassifiedInfoUpdate();
 
-	mUpdateBtn->setLabelSelected("Publish...");
-	mUpdateBtn->setLabelUnselected("Publish...");
+	mUpdateBtn->setLabel(childGetText("publish_txt"));
 }
 
 
@@ -575,8 +574,8 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
 		self->mPosGlobal = pos_global;
 
 		// Update UI controls
-        self->mNameEditor->setText(name);
-        self->mDescEditor->setText(desc);
+        self->mNameEditor->setText(LLString(name));
+        self->mDescEditor->setText(LLString(desc));
         self->mSnapshotCtrl->setImageAssetID(snapshot_id);
         self->mLocationEditor->setText(location_text);
 		self->mLocationChanged = false;
@@ -596,8 +595,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
 		// If we got data from the database, we know the listing is paid for.
 		self->mPaidFor = TRUE;
 
-		self->mUpdateBtn->setLabelSelected("Update");
-		self->mUpdateBtn->setLabelUnselected("Update");
+		self->mUpdateBtn->setLabel(self->childGetText("update_txt"));
     }
 }