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

updates destination guide and avatar picker urls 

added close button to destination guide and avatar picker
meow-7.2.2
Richard Linden 2011-02-25 13:48:20 -08:00
parent 5663ef405d
commit 31d0bf5ba5
8 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llradiogroup.cpp
View File

@ -346,7 +346,7 @@ void LLRadioGroup::setValue( const LLSD& value )
}
else
{
llwarns << "LLRadioGroup::setValue: value not found: " << value.asString() << llendl;
setSelectedIndex(-1, TRUE);
}
}
}

2
indra/newview/CMakeLists.txt
View File

@ -1298,6 +1298,8 @@ endif (WINDOWS)
set(viewer_XUI_FILES
skins/default/colors.xml
skins/default/textures/textures.xml
skins/minimal/colors.xml
skins/minimal/textures/textures.xml

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

@ -34,7 +34,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://interest.secondlife.com/viewer/guide</string>
<string>http://pdp48.lindenlab.com:8001/viewer/guide/</string>
</map>
<key>DisableExternalBrowser</key>
<map>
@ -279,7 +279,9 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://interest.secondlife.com/static/viewer/avatar</string>
<string>
http://pdp48.lindenlab.com:8001/static/viewer/avatar/index.html
</string>
</map>
<key>OpenSidePanelsInFloaters</key>
<map>

8
indra/newview/llviewermenu.cpp
View File

@ -843,9 +843,9 @@ class LLAdvancedCheckFeature : public view_listener_t
}
};
void LLDestinationAndAvatarShow(const LLSD& value)
void toggle_destination_and_avatar_picker(const LLSD& show)
{
S32 panel_idx = value.isDefined() ? value.asInteger() : -1;
S32 panel_idx = show.isDefined() ? show.asInteger() : -1;
LLView* container = gViewerWindow->getRootView()->getChildView("avatar_picker_and_destination_guide_container");
LLMediaCtrl* destinations = container->findChild<LLMediaCtrl>("destination_guide_contents");
LLMediaCtrl* avatar_picker = container->findChild<LLMediaCtrl>("avatar_picker_contents");
@ -870,6 +870,8 @@ void LLDestinationAndAvatarShow(const LLSD& value)
avatar_picker->setVisible(false);
break;
}
gViewerWindow->getRootView()->getChildView("bottom_tray")->getChild<LLUICtrl>("avatar_and_destination_btns")->setValue(show);
};
@ -8246,5 +8248,5 @@ void initialize_menus()
view_listener_t::addMenu(new LLToggleUIHints(), "ToggleUIHints");
commit.add("DestinationAndAvatar.show", boost::bind(&LLDestinationAndAvatarShow, _2));
commit.add("DestinationAndAvatar.show", boost::bind(&toggle_destination_and_avatar_picker, _2));
}

2
indra/newview/llviewermenu.h
View File

@ -126,6 +126,8 @@ bool enable_pay_object();
bool enable_buy_object();
bool handle_go_to();
void toggle_destination_and_avatar_picker(const LLSD& show);
// Export to XML or Collada
void handle_export_selected( void * );

1
indra/newview/llviewerwindow.cpp
View File

@ -1777,6 +1777,7 @@ void LLViewerWindow::initWorldUI()
buttons_panel_container->addChild(buttons_panel);
LLView* avatar_picker_destination_guide_container = gViewerWindow->getRootView()->getChild<LLView>("avatar_picker_and_destination_guide_container");
avatar_picker_destination_guide_container->getChild<LLButton>("close")->setCommitCallback(boost::bind(toggle_destination_and_avatar_picker, LLSD()));
LLMediaCtrl* destinations = avatar_picker_destination_guide_container->findChild<LLMediaCtrl>("destination_guide_contents");
LLMediaCtrl* avatar_picker = avatar_picker_destination_guide_container->findChild<LLMediaCtrl>("avatar_picker_contents");
if (destinations)

3
indra/newview/skins/minimal/textures/textures.xml
View File

@ -2,4 +2,7 @@
<textures version="101">
<texture name="Button_Separator" file_name="bottomtray/button_separator.png" preload="true" />
<texture name="arrow_keys.png"/>
<texture name="bottomtray_close_off" file_name="bottomtray/close_off.png" preload="true" />
<texture name="bottomtray_close_over" file_name="bottomtray/close_over.png" preload="true" />
<texture name="bottomtray_close_press" file_name="bottomtray/close_press.png" preload="true" />
</textures>

20
indra/newview/skins/minimal/xui/en/main_view.xml
View File

@ -124,20 +124,20 @@
name="bottom_tray_container"
visible="false"/>
<layout_panel auto_resize="false"
height="195"
height="200"
mouse_opaque="false"
user_resize="false"
name="avatar_picker_and_destination_guide_container"
visible="false">
<panel top="0"
height="195"
height="200"
left="0"
background_visible="true"
width="500"
follows="all">
<web_browser
top="0"
height="195"
height="200"
follows="all"
name="destination_guide_contents"
trusted_content="true"
@ -145,12 +145,24 @@
start_url="http://interest.secondlife/viewer/guide"/>
<web_browser
top="0"
height="195"
height="200"
follows="all"
name="avatar_picker_contents"
visible="false"
trusted_content="true"
start_url="http://interest.secondlife/viewer/avatar"/>
<button
name="close"
width="22"
height="23"
right="-10"
top="2"
follows="top|right"
chrome="true"
tab_stop="false"
image_unselected="bottomtray_close_off"
image_selected="bottomtray_close_press"
/>
</panel>
</layout_panel>
</layout_stack>