merge

indra/newview/llfirstuse.cpp

@@ -113,7 +113,8 @@ void LLFirstUse::notUsingSidePanel(bool enable)
 // static
 void LLFirstUse::notMoving(bool enable)
 {
-	//firstUseNotification("FirstNotMoving", enable, "HintMove", LLSD(), LLSD().with("target", "move_btn").with("direction", "top"));
+	// fire off 2 notifications and rely on filtering to select the relevant one
+	firstUseNotification("FirstNotMoving", enable, "HintMove", LLSD(), LLSD().with("target", "move_btn").with("direction", "top"));
 	firstUseNotification("FirstNotMoving", enable, "HintMoveArrows", LLSD(), LLSD().with("hint_image", "arrow_keys.png"));
 }
 

indra/newview/skins/default/xui/en/notification_visibility.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" ?>
 <notification_visibility>
+  <hide name="HintMoveArrows"/>
 	<show/> 
 </notification_visibility>
 

indra/newview/skins/default/xui/en/panel_hint_image.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  width="205"
- height="200"
+ height="140"
  layout="topleft">
   <text name="hint_title"
         font="SansSerifMedium" 
@@ -23,7 +23,7 @@
         left="8"
         right="197"
         top_pad="5"
-        bottom="92"
+        bottom="120"
         follows="all" 
         text_color="Black"
         wrap="true"/>