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

SOCIAL-714 FIX [PUBLIC] Basic mode to launch with Destinations panel open by default

meow-7.2.2
Richard Linden 2011-03-23 17:02:23 -07:00
parent c7f796c366
commit 9c82ea334a
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12608,5 +12608,16 @@
<key>Value</key>
<string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/404.html</string>
</map>
<key>DestinationsAndAvatarsVisibility</key>
<map>
<key>Comment</key>
<string>Whether destination panel or avatar picker are open (0=destination guide, 1=avatar picker, default=nothing)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>-1</integer>
</map>
</map>
</llsd>

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

@ -402,5 +402,16 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>DestinationsAndAvatarsVisibility</key>
<map>
<key>Comment</key>
<string>Whether destination panel or avatar picker are open (0=destination guide, 1=avatar picker, default=nothing)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

14
indra/newview/llviewermenu.cpp
View File

@ -863,7 +863,6 @@ void toggle_destination_and_avatar_picker(const LLSD& show)
LLFirstUse::notUsingDestinationGuide(false);
avatar_btn->setToggleState(false);
destination_btn->setToggleState(true);
return;
}
break;
case 1:
@ -874,18 +873,17 @@ void toggle_destination_and_avatar_picker(const LLSD& show)
avatar_picker->setVisible(true);
avatar_btn->setToggleState(true);
destination_btn->setToggleState(false);
return;
}
break;
default:
container->setVisible(false);
destinations->setVisible(false);
avatar_picker->setVisible(false);
avatar_btn->setToggleState(false);
destination_btn->setToggleState(false);
break;
}
container->setVisible(false);
destinations->setVisible(false);
avatar_picker->setVisible(false);
avatar_btn->setToggleState(false);
destination_btn->setToggleState(false);
gSavedSettings.setS32("DestinationsAndAvatarsVisibility", panel_idx);
};

7
indra/newview/llviewerwindow.cpp
View File

@ -1801,11 +1801,8 @@ void LLViewerWindow::initWorldUI()
avatar_picker->navigateTo(gSavedSettings.getString("AvatarPickerURL"), "text/html");
}
if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
{
toggle_destination_and_avatar_picker(0);
gSavedSettings.setBOOL("FirstLoginThisInstall", FALSE);
}
// show destinations by default
toggle_destination_and_avatar_picker(gSavedSettings.getS32("DestinationsAndAvatarsVisibility"));
}
// Destroy the UI