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

Pull from richard/viewer-experience-fui

meow-7.2.2
Merov Linden 2011-10-06 20:01:40 -07:00
parent ea02a6a80d 1bd5fd7edc
commit 8919ef0ea4
6 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/commands.xml
View File

@ -26,9 +26,9 @@
label_ref="Command_Avatar_Label"
tooltip_ref="Command_Avatar_Tooltip"
execute_function="Floater.ToolbarToggle"
execute_parameters="avatar_picker"
execute_parameters="avatar"
is_running_function="Floater.IsOpen"
is_running_parameters="avatar_picker"
is_running_parameters="avatar"
/>
<command name="build"
available_in_toybox="true"

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

@ -619,7 +619,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
<string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/avatars.html</string>
</map>
<key>AvatarBakedTextureUploadTimeout</key>
<map>

1
indra/newview/llviewerfloaterreg.cpp
View File

@ -168,6 +168,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("about_land", "floater_about_land.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLand>);
LLFloaterReg::add("appearance", "floater_my_appearance.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("auction", "floater_auction.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAuction>);
LLFloaterReg::add("avatar", "floater_avatar.xml", &LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("avatar_picker", "floater_avatar_picker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarPicker>);
LLFloaterReg::add("avatar_textures", "floater_avatar_textures.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarTextures>);

6
indra/newview/llviewerwindow.cpp
View File

@ -1945,6 +1945,12 @@ void LLViewerWindow::initWorldUI()
destinations->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL"), "text/html");
}
LLMediaCtrl* avatar_picker = LLFloaterReg::getInstance("avatar")->findChild<LLMediaCtrl>("avatar_picker_contents");
if (avatar_picker)
{
avatar_picker->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
avatar_picker->navigateTo(gSavedSettings.getString("AvatarPickerURL"), "text/html");
}
}
// Destroy the UI

26
indra/newview/skins/default/xui/en/floater_avatar.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="225"
can_minimize="true"
can_close="true"
user_resize="true"
can_resize="true"
min_height="230"
min_width="455"
max_height="230"
height="230"
layout="topleft"
name="Avatar"
single_instance="true"
help_topic="avatar"
save_rect="true"
title="Avatar Picker"
width="445">
<web_browser
top="25"
height="200"
width="435"
follows="all"
name="avatar_picker_contents"
trusted_content="true"/>
</floater>

2
indra/newview/skins/default/xui/en/floater_destinations.xml
View File

@ -6,6 +6,8 @@
user_resize="true"
can_resize="true"
min_height="230"
min_width="525"
max_height="230"
height="230"
layout="topleft"
name="Destinations"