diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
| commit | 3aa12e85f04f0608da5df05b2cbb01685ef62944 (patch) | |
| tree | 02e78886d530c92e3eddf0f73f3eb7f8a5b641da /indra/newview/llfirstuse.cpp | |
| parent | bae83c7eac98229271a6baf4c961fe167c74a597 (diff) | |
| parent | a702b34394e4b38b27338eb6d68d22b498984118 (diff) | |
merge fix(es) for storm-378
Diffstat (limited to 'indra/newview/llfirstuse.cpp')
| -rw-r--r-- | indra/newview/llfirstuse.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index b08c113923..4c17199895 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -100,9 +100,16 @@ void LLFirstUse::useSandbox() void LLFirstUse::notUsingDestinationGuide(bool enable) { // not doing this yet - //firstUseNotification("FirstNotUseDestinationGuide", enable, "HintDestinationGuide", LLSD(), LLSD().with("target", "dest_guide_btn").with("direction", "left")); + firstUseNotification("FirstNotUseDestinationGuide", enable, "HintDestinationGuide", LLSD(), LLSD().with("target", "dest_guide_btn").with("direction", "top")); } +void LLFirstUse::notUsingAvatarPicker(bool enable) +{ + // not doing this yet + firstUseNotification("FirstNotUseAvatarPicker", enable, "HintAvatarPicker", LLSD(), LLSD().with("target", "avatar_picker_btn").with("direction", "top")); +} + + // static void LLFirstUse::notUsingSidePanel(bool enable) { @@ -113,7 +120,15 @@ void LLFirstUse::notUsingSidePanel(bool enable) // static void LLFirstUse::notMoving(bool enable) { + // 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("target", "bottom_tray").with("direction", "top").with("hint_image", "arrow_keys.png").with("down_arrow", "")); +} + +// static +void LLFirstUse::viewPopup(bool enable) +{ + firstUseNotification("FirstViewPopup", enable, "HintView", LLSD(), LLSD().with("target", "view_popup").with("direction", "right")); } // static |