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

EXT-4013 : Functionality loss: Inspect object 

Detail button implemented as instructed; this brings up the old 1.23 multi-inspect floater.
master
Loren Shih 2010-03-03 11:03:46 -05:00
parent 6ebc1d8858
commit 0ac63ffbb1
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llsidepaneltaskinfo.cpp
View File

@ -100,6 +100,8 @@ BOOL LLSidepanelTaskInfo::postBuild()
mPayBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onPayButtonClicked, this));
mBuyBtn = getChild<LLButton>("buy_btn");
mBuyBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onBuyButtonClicked, this));
mDetailsBtn = getChild<LLButton>("details_btn");
mDetailsBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onDetailsButtonClicked, this));
mLabelGroupName = getChild<LLNameBox>("Group Name Proxy");
@ -1122,6 +1124,15 @@ void LLSidepanelTaskInfo::updateVerbs()
//mEditBtn->setEnabled(obj && obj->permModify());
*/
LLSafeHandle<LLObjectSelection> object_selection = LLSelectMgr::getInstance()->getSelection();
const BOOL multi_select = (object_selection->getNumNodes() > 1);
mOpenBtn->setVisible(!multi_select);
mPayBtn->setVisible(!multi_select);
mBuyBtn->setVisible(!multi_select);
mDetailsBtn->setVisible(multi_select);
mDetailsBtn->setEnabled(multi_select);
mOpenBtn->setEnabled(enable_object_open());
mPayBtn->setEnabled(enable_pay_object());
mBuyBtn->setEnabled(enable_buy_object());
@ -1145,6 +1156,11 @@ void LLSidepanelTaskInfo::onBuyButtonClicked()
doClickAction(CLICK_ACTION_BUY);
}
void LLSidepanelTaskInfo::onDetailsButtonClicked()
{
LLFloaterReg::showInstance("inspect", LLSD());
}
// virtual
void LLSidepanelTaskInfo::save()
{

2
indra/newview/llsidepaneltaskinfo.h
View File

@ -109,10 +109,12 @@ protected:
void onOpenButtonClicked();
void onPayButtonClicked();
void onBuyButtonClicked();
void onDetailsButtonClicked();
private:
LLButton* mOpenBtn;
LLButton* mPayBtn;
LLButton* mBuyBtn;
LLButton* mDetailsBtn;
protected:
LLViewerObject* getObject();

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

@ -549,5 +549,16 @@
name="buy_btn"
top="0"
width="100" />
<button
follows="bottom|left"
height="23"
label="Details"
layout="topleft"
left="5"
name="details_btn"
top="0"
width="100"
visible="false" />
</panel>
</panel>