livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SOCIAL-601 FIX avatar picker hint

meow-7.2.2
Richard Linden 2011-02-28 17:38:35 -08:00
parent f9301bb10f
commit 903b3ab35d
6 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -12333,17 +12333,6 @@
<key>Value</key>
<real>1200.0</real>
</map>
<key>AvatarPickerHintTimeout</key>
<map>
<key>Comment</key>
<string>Number of seconds to wait before telling resident about avatar picker.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>600.0</real>
</map>
<key>SidePanelHintTimeout</key>
<map>
<key>Comment</key>

7
indra/newview/llfirstuse.cpp
View File

@ -104,13 +104,6 @@ void LLFirstUse::notUsingDestinationGuide(bool enable)
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)
{

1
indra/newview/llfirstuse.h
View File

@ -87,7 +87,6 @@ public:
static void otherAvatarChatFirst(bool enable = true);
static void sit(bool enable = true);
static void notUsingDestinationGuide(bool enable = true);
static void notUsingAvatarPicker(bool enable = true);
static void notUsingSidePanel(bool enable = true);
static void notMoving(bool enable = true);
static void viewPopup(bool enable = true);

1
indra/newview/llviewermenu.cpp
View File

@ -862,7 +862,6 @@ void toggle_destination_and_avatar_picker(const LLSD& show)
container->setVisible(true);
destinations->setVisible(false);
avatar_picker->setVisible(true);
LLFirstUse::notUsingAvatarPicker(false);
break;
default:
container->setVisible(false);

4
indra/newview/llviewerwindow.cpp
View File

@ -2561,10 +2561,6 @@ void LLViewerWindow::updateUI()
{
LLFirstUse::notUsingDestinationGuide();
}
if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("AvatarPickerHintTimeout"))
{
LLFirstUse::notUsingAvatarPicker();
}
if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("SidePanelHintTimeout"))
{
LLFirstUse::notUsingSidePanel();

8
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -6849,14 +6849,6 @@ Mute everyone?
The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring.
</notification>
<notification
name="HintAvatarPicker"
label="Change your Look"
type="hint"
unique="true">
Would you like to try a new look? Click the button below to see more Avatars.
</notification>
<notification
name="HintSidePanel"
label="Side Panel"