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

STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects

master
Jonathan Yap 2010-12-23 17:12:37 -05:00
parent 49de8add83
commit 1ca028cd7b
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/contributions.txt
View File

@ -354,11 +354,12 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
VWR-17801
STORM-596
STORM-616
STORM-679
STORM-596
STORM-726
STORM-812
VWR-17801
Kage Pixel
VWR-11
Ken March

12
indra/newview/llsidepaneltaskinfo.cpp
View File

@ -1120,17 +1120,17 @@ void LLSidepanelTaskInfo::updateVerbs()
*/
LLSafeHandle<LLObjectSelection> object_selection = LLSelectMgr::getInstance()->getSelection();
const BOOL multi_select = (object_selection->getNumNodes() > 1);
const BOOL any_selected = (object_selection->getNumNodes() > 0);
mOpenBtn->setVisible(!multi_select);
mPayBtn->setVisible(!multi_select);
mBuyBtn->setVisible(!multi_select);
mDetailsBtn->setVisible(multi_select);
mDetailsBtn->setEnabled(multi_select);
mOpenBtn->setVisible(true);
mPayBtn->setVisible(true);
mBuyBtn->setVisible(true);
mDetailsBtn->setVisible(true);
mOpenBtn->setEnabled(enable_object_open());
mPayBtn->setEnabled(enable_pay_object());
mBuyBtn->setEnabled(enable_buy_object());
mDetailsBtn->setEnabled(any_selected);
}
void LLSidepanelTaskInfo::onOpenButtonClicked()

11
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
View File

@ -533,7 +533,7 @@
left="5"
name="open_btn"
top="0"
width="100" />
width="73" />
<button
follows="bottom|left"
height="23"
@ -542,7 +542,7 @@
left_pad="5"
name="pay_btn"
top="0"
width="100" />
width="73" />
<button
follows="bottom|left"
height="23"
@ -551,17 +551,16 @@
left_pad="5"
name="buy_btn"
top="0"
width="100" />
width="73" />
<button
follows="bottom|left"
height="23"
label="Details"
layout="topleft"
left="5"
left_pad="5"
name="details_btn"
top="0"
width="100"
visible="false" />
width="74" />
</panel>
</panel>