Work on normal bug EXT-4518 (movement & camera floaters should have window titles)

-- done for Move floater.
-- deprecated comments cleaned up

--HG--
branch : product-engine

3 files changed, 37 insertions, 4 deletions

diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 97e2b5b86e..ac4b98734b 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -87,6 +87,7 @@ LLFloaterMove::LLFloaterMove(const LLSD& key)
 BOOL LLFloaterMove::postBuild()
 {
 	setIsChrome(TRUE);
+	setTitleVisible(TRUE); // restore title visibility after chrome applying
 	
 	LLDockableFloater::postBuild();
 	
@@ -353,6 +354,7 @@ void LLFloaterMove::updateButtonsWithMovementMode(const EMovementMode newMode)
 	showFlyControls(MM_FLY == newMode);
 	setModeTooltip(newMode);
 	setModeButtonToggleState(newMode);
+	setModeTitle(newMode);
 }
 
 void LLFloaterMove::showFlyControls(bool bShow)
@@ -420,11 +422,30 @@ void LLFloaterMove::setModeTooltip(const EMovementMode mode)
 	}
 }
 
+void LLFloaterMove::setModeTitle(const EMovementMode mode)
+{
+	std::string title; 
+	switch(mode)
+	{
+	case MM_WALK:
+		title = getString("walk_title");
+		break;
+	case MM_RUN:
+		title = getString("run_title");
+		break;
+	case MM_FLY:
+		title = getString("fly_title");
+		break;
+	default:
+		// title should be provided for all modes
+		llassert(false);
+		break;
+	}
+	setTitle(title);
+}
+
 /**
  * Updates position of the floater to be center aligned with Move button.
- * 
- * Because Tip floater created as dependent floater this method 
- * must be called before "showQuickTips()" to get Tip floater be positioned at the right side of the floater
  */
 void LLFloaterMove::updatePosition()
 {
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index 06463f02af..1bd36e4d74 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -92,7 +92,7 @@ private:
 	void showFlyControls(bool bShow);
 	void initModeTooltips();
 	void setModeTooltip(const EMovementMode mode);
-	void showQuickTips(const EMovementMode mode);
+	void setModeTitle(const EMovementMode mode);
 	void initModeButtonMap();
 	void setModeButtonToggleState(const EMovementMode mode);
 	void updateButtonsWithMovementMode(const EMovementMode newMode);
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 0a5820ce73..520741186e 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -38,6 +38,18 @@
      name="fly_back_tooltip">
         Fly Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="walk_title">
+        Walk
+    </string>
+    <string
+     name="run_title">
+        Run
+    </string>
+    <string
+     name="fly_title">
+        Fly
+    </string>
     <panel
      border="false"
      height="83"