Skip to content
Snippets Groups Projects
Commit bbbacf1c authored by richard's avatar richard
Browse files

eliminated various warnings when parsing side tray

parent ecaf21b2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 128 deletions
indra/newview/llnavigationbar.cpp
+ 0
− 2
View file @ bbbacf1c
......@@ -174,8 +174,6 @@ LLNavigationBar::LLNavigationBar()
mSearchComboBox(NULL),
mPurgeTPHistoryItems(false)
{
setIsChrome(TRUE);
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_navigation_bar.xml");
// set a listener function for LoginComplete event
......
indra/newview/llpanelplaceprofile.cpp
+ 1
− 1
View file @ bbbacf1c
......@@ -529,7 +529,7 @@ void LLPanelPlaceProfile::updateYouAreHereBanner(void* userdata)
if(!self->getVisible())
return;
if(!gDisconnected)
if(!gDisconnected && gAgent.getRegion())
{
static F32 radius = gSavedSettings.getF32("YouAreHereDistance");
......
indra/newview/skins/default/xui/en/floater_sell_land.xml
+ 0
− 1
View file @ bbbacf1c
......@@ -13,7 +13,6 @@
color="DkGray2"
follows="left|top|right|bottom"
height="435"
min_height="300"
layout="topleft"
name="profile_scroll"
reserve_scroll_corner="true"
......
indra/newview/skins/default/xui/en/panel_avatar_tag.xml
+ 0
− 1
View file @ bbbacf1c
......@@ -55,7 +55,6 @@
top="65"
left="10"
right="-10"
can_resize="true"
height="100"
follows="left|top|bottom|right"
font="SansSerifSmall"
......
indra/newview/skins/default/xui/en/panel_bars.xml
+ 8
− 59
View file @ bbbacf1c
......@@ -5,65 +5,14 @@
layout="topleft"
left="0"
mouse_opaque="false"
name="bottom_panel"
name="screen"
width="1024">
<panel
follows="left|right|top|bottom"
height="728"
layout="topleft"
left="0"
mouse_opaque="false"
name="status"
top="0"
width="1024" />
<layout_stack
border_size="0"
follows="left|right|bottom|top"
height="768"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="bar_stack"
top_delta="0"
use_bounding_rect="true"
width="1024">
<layout_panel
follows="left|right|top|bottom"
height="768"
layout="topleft"
left="0"
mouse_opaque="false"
name="spacer"
top="0"
user_resize="false"
width="1024" />
<layout_panel
auto_resize="false"
height="200"
layout="topleft"
min_height="200"
mouse_opaque="false"
name="overlay"
use_bounding_rect="true"
user_resize="false"
width="1024" />
<layout_panel
auto_resize="false"
filename="panel_toolbar.xml"
layout="topleft"
min_height="28"
name="toolbar"
use_bounding_rect="true"
user_resize="false"
width="1024" />
<layout_stack name="menu_stack" orientation="vertical" height="768" border_size="0">
<panel auto_resize="false" width="1024" name="status_bar" filename="panel_status_bar.xml"/>
<panel auto_resize="false" width="1024" height="65" name="navigation bar" filename="panel_navigation_bar.xml"/>
<layout_stack name="hud_stack" orientation="horizontal" auto_resize="true" width="1024" height="500" follows="all">
<panel auto_resize="true" name="floater_view" height="500"/>
<panel auto_resize="false" filename="panel_side_tray.xml" height="500" width="333"/>
</layout_stack>
<panel
follows="left|right|top|bottom"
height="728"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="hud"
top_delta="-10"
width="1024" />
</layout_stack>
</panel>
indra/newview/skins/default/xui/en/panel_edit_eyes.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -37,13 +37,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="eyes_main_tab"
title="Eyes">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="eyes_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_gloves.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="gloves_main_tab"
title="Gloves">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="gloves_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_hair.xml
+ 0
− 8
View file @ bbbacf1c
......@@ -37,13 +37,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="hair_color_tab"
title="Color">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="hair_color_param_list"
......@@ -51,13 +49,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="hair_style_tab"
title="Style">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="hair_style_param_list"
......@@ -65,13 +61,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="hair_eyebrows_tab"
title="Eyebrows">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="hair_eyebrows_param_list"
......@@ -79,13 +73,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="hair_facial_tab"
title="Facial">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="hair_facial_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_jacket.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -61,13 +61,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="jacket_main_tab"
title="Jacket">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="jacket_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_pants.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="pants_main_tab"
title="Pants">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="pants_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_shape.xml
+ 0
− 18
View file @ bbbacf1c
......@@ -59,13 +59,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_body_tab"
title="Body">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_body_param_list"
......@@ -73,13 +71,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_head_tab"
title="Head">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_head_param_list"
......@@ -87,13 +83,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_eyes_tab"
title="Eyes">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_eyes_param_list"
......@@ -101,13 +95,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_ears_tab"
title="Ears">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_ears_param_list"
......@@ -115,13 +107,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_nose_tab"
title="Nose">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_nose_param_list"
......@@ -129,13 +119,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_mouth_tab"
title="Mouth">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_mouth_param_list"
......@@ -143,13 +131,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_chin_tab"
title="Chin">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_chin_param_list"
......@@ -157,13 +143,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_torso_tab"
title="Torso">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_torso_param_list"
......@@ -171,13 +155,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shape_legs_tab"
title="Legs">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shape_legs_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_shirt.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shirt_main_tab"
title="Shirt">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shirt_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_shoes.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="shoes_main_tab"
title="Shoes">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="shoes_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_skin.xml
+ 0
− 8
View file @ bbbacf1c
......@@ -64,13 +64,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="skin_color_tab"
title="Skin Color">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="skin_color_param_list"
......@@ -78,13 +76,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="skin_face_tab"
title="Face Detail">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="skin_face_param_list"
......@@ -92,13 +88,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="skin_makeup_tab"
title="Makeup">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="skin_makeup_param_list"
......@@ -106,13 +100,11 @@
width="303" />
</accordion_tab>
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="skin_body_tab"
title="Body Detail">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="skin_body_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_skirt.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="skirt_main_tab"
title="Skirt">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="skirt_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_socks.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="socks_main_tab"
title="Socks">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="socks_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_underpants.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="underpants_main_tab"
title="Underpants">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="underpants_main_param_list"
......
indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
+ 0
− 2
View file @ bbbacf1c
......@@ -49,13 +49,11 @@
top_pad="10"
width="303">
<accordion_tab
can_resize="false"
layout="topleft"
min_height="150"
name="undershirt_main_tab"
title="Undershirt">
<scrolling_panel_list
draw_heading="false"
follows="all"
left="0"
name="undershirt_main_param_list"
......
indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+ 0
− 5
View file @ bbbacf1c
......@@ -120,12 +120,10 @@ background_visible="true"
height="425"
layout="topleft"
left="0"
multiple_expansion="false"
name="groups_accordion"
top_pad="15"
width="336">
<accordion_tab
can_resize="false"
expanded="true"
layout="topleft"
name="tab_general"
......@@ -153,7 +151,6 @@ background_visible="true"
</scroll_container>
</accordion_tab>
<accordion_tab
can_resize="false"
expanded="false"
layout="topleft"
name="tab_roles"
......@@ -181,7 +178,6 @@ background_visible="true"
</scroll_container>
</accordion_tab>
<accordion_tab
can_resize="false"
expanded="false"
layout="topleft"
name="tab_notices"
......@@ -209,7 +205,6 @@ background_visible="true"
</scroll_container>
</accordion_tab>
<accordion_tab
can_resize="false"
expanded="false"
layout="topleft"
name="tab_notices"
......
indra/newview/skins/default/xui/en/panel_group_land_money.xml
+ 1
− 5
View file @ bbbacf1c
......@@ -304,7 +304,6 @@
image_overlay="Arrow_Left_Off"
layout="topleft"
name="earlier_details_button"
picture_style="true"
tool_tip="Back"
top_pad="3"
right="-35"
......@@ -315,8 +314,7 @@
image_overlay="Arrow_Right_Off"
layout="topleft"
left_pad="10"
name="later_details_button"
picture_style="true"
name="later_details_button"
tool_tip="Next"
width="31" />
</panel>
......@@ -350,7 +348,6 @@
image_overlay="Arrow_Left_Off"
layout="topleft"
name="earlier_sales_button"
picture_style="true"
tool_tip="Back"
top_pad="3"
right="-35"
......@@ -362,7 +359,6 @@
layout="topleft"
left_pad="10"
name="later_sales_button"
picture_style="true"
tool_tip="Next"
width="31" />
</panel>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment