diff options
| author | Richard Linden <none@none> | 2010-10-07 15:01:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-07 15:01:19 -0700 |
| commit | 44366841d35d2b2a78e18f5e6f60fe5328263be7 (patch) | |
| tree | 4df58ca89126c9aefe18793c46ce9ad439fc78b7 /indra/newview | |
| parent | c154e4b794489ff876b60b9ccfcb72ec1836cea2 (diff) | |
| parent | 49392504d95abbb2518479baa969c2963bd73adf (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfirstuse.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notification_visibility.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_hint_image.xml | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index 4d6302596b..b757f25d5e 100644 --- a/indra/newview/llfirstuse.cpp +++ b/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")); } diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml index ea32a83b83..d32066a5a5 100644 --- a/indra/newview/skins/default/xui/en/notification_visibility.xml +++ b/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> diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml index 31a310c07b..00b6e42497 100644 --- a/indra/newview/skins/default/xui/en/panel_hint_image.xml +++ b/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"/> |