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

1 files changed, 33 insertions, 15 deletions

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 2c0cb4164d..4f8ed08a69 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -317,6 +317,16 @@ BOOL	LLFloaterTools::postBuild()
 		mTab->setBorderVisible(FALSE);
 		mTab->selectFirstTab();
 	}
+
+	mStatusText["rotate"] = childGetText("status_rotate");
+	mStatusText["scale"] = childGetText("status_scale");
+	mStatusText["move"] = childGetText("status_move");
+	mStatusText["modifyland"] = childGetText("status_modifyland");
+	mStatusText["camera"] = childGetText("status_camera");
+	mStatusText["grab"] = childGetText("status_grab");
+	mStatusText["place"] = childGetText("status_place");
+	mStatusText["selectland"] = childGetText("status_selectland");
+	
 	return TRUE;
 }
 
@@ -418,9 +428,17 @@ LLFloaterTools::~LLFloaterTools()
 	// children automatically deleted
 }
 
-void LLFloaterTools::setStatusText(const LLString& text)
+void LLFloaterTools::setStatusText(const std::string& text)
 {
-	mTextStatus->setText(text);
+	std::map<std::string, std::string>::iterator iter = mStatusText.find(text);
+	if (iter != mStatusText.end())
+	{
+		mTextStatus->setText(iter->second);
+	}
+	else
+	{
+		mTextStatus->setText(text);
+	}
 }
 
 void LLFloaterTools::refresh()
@@ -587,27 +605,27 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 
 	if (mComboGridMode) 
 	{
-		mComboGridMode		->setVisible( edit_visible );
+		mComboGridMode->setVisible( edit_visible );
 		S32 index = mComboGridMode->getCurrentIndex();
 		mComboGridMode->removeall();
 
 		switch (mObjectSelection->getSelectType())
 		{
 		case SELECT_TYPE_HUD:
-			mComboGridMode->add("Screen");
-			mComboGridMode->add("Local");
-			//mComboGridMode->add("Reference");
-			break;
+		  mComboGridMode->add(childGetText("grid_screen_text"));
+		  mComboGridMode->add(childGetText("grid_local_text"));
+		  //mComboGridMode->add(childGetText("grid_reference_text"));
+		  break;
 		case SELECT_TYPE_WORLD:
-			mComboGridMode->add("World");
-			mComboGridMode->add("Local");
-			mComboGridMode->add("Reference");
-			break;
+		  mComboGridMode->add(childGetText("grid_world_text"));
+		  mComboGridMode->add(childGetText("grid_local_text"));
+		  mComboGridMode->add(childGetText("grid_reference_text"));
+		  break;
 		case SELECT_TYPE_ATTACHMENT:
-			mComboGridMode->add("Attachment");
-			mComboGridMode->add("Local");
-			mComboGridMode->add("Reference");
-			break;
+		  mComboGridMode->add(childGetText("grid_attachment_text"));
+		  mComboGridMode->add(childGetText("grid_local_text"));
+		  mComboGridMode->add(childGetText("grid_reference_text"));
+		  break;
 		}
 
 		mComboGridMode->setCurrentByIndex(index);