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

Merge

meow-7.2.2
Tank_Master 2011-06-12 10:00:49 -07:00
parent bcf6b79dd5 adc42c7a9c
commit 2fbde9f5af
4 changed files with 44 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llgroupactions.cpp
View File

@ -337,7 +337,8 @@ void LLGroupActions::refresh_notices()
params["open_tab_name"] = "panel_group_info_sidetray";
params["action"] = "refresh_notices";
LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
// AO: We don't change modals on people unless they manually request this
//LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
}
//static

39
indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
View File

@ -149,37 +149,26 @@ background_visible="true"
</tab_container>
</layout_panel>
</layout_stack>
<button
follows="bottom|left"
height="23"
image_overlay="Refresh_Off"
layout="topleft"
left="6"
top_pad="5"
name="btn_refresh"
width="23" />
<layout_stack
follows="bottom|left|right"
height="25"
layout="topleft"
name="button_row_ls"
left="6"
left_pad="0"
orientation="horizontal"
top_pad="5"
width="475">
<layout_panel
follows="bottom|left|right"
height="23"
layout="bottomleft"
left="0"
name="btn_refresh_lp"
user_resize="false"
auto_resize="false"
width="24">
<button
follows="bottom|left|right"
height="23"
image_overlay="Refresh_Off"
layout="topleft"
left="1"
top="0"
name="btn_refresh"
width="23" />
</layout_panel>
top_delta="2"
width="445">
<layout_panel
follows="bottom|left|right"
height="23"

39
indra/newview/skins/firestormsidetabs/xui/en/panel_group_info_sidetray.xml
View File

@ -149,37 +149,26 @@ background_visible="true"
</tab_container>
</layout_panel>
</layout_stack>
<button
follows="bottom|left"
height="23"
image_overlay="Refresh_Off"
layout="topleft"
left="6"
top_pad="5"
name="btn_refresh"
width="23" />
<layout_stack
follows="bottom|left|right"
height="25"
layout="topleft"
name="button_row_ls"
left="6"
left_pad="0"
orientation="horizontal"
top_pad="5"
width="475">
<layout_panel
follows="bottom|left|right"
height="23"
layout="bottomleft"
left="0"
name="btn_refresh_lp"
user_resize="false"
auto_resize="false"
width="24">
<button
follows="bottom|left|right"
height="23"
image_overlay="Refresh_Off"
layout="topleft"
left="1"
top="0"
name="btn_refresh"
width="23" />
</layout_panel>
top_delta="2"
width="445">
<layout_panel
follows="bottom|left|right"
height="23"

39
indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
View File

@ -149,37 +149,26 @@ background_visible="true"
</tab_container>
</layout_panel>
</layout_stack>
<button
follows="bottom|left"
height="23"
image_overlay="Refresh_Off"
layout="topleft"
left="6"
top_pad="5"
name="btn_refresh"
width="23" />
<layout_stack
follows="bottom|left|right"
height="25"
layout="topleft"
name="button_row_ls"
left="6"
left_pad="0"
orientation="horizontal"
top_pad="5"
width="475">
<layout_panel
follows="bottom|left|right"
height="23"
layout="bottomleft"
left="0"
name="btn_refresh_lp"
user_resize="false"
auto_resize="false"
width="24">
<button
follows="bottom|left|right"
height="23"
image_overlay="Refresh_Off"
layout="topleft"
left="1"
top="0"
name="btn_refresh"
width="23" />
</layout_panel>
top_delta="2"
width="445">
<layout_panel
follows="bottom|left|right"
height="23"