diff options
| author | Sam Kolb <skolb@lindenlab.com> | 2007-08-30 22:11:52 +0000 |
|---|---|---|
| committer | Sam Kolb <skolb@lindenlab.com> | 2007-08-30 22:11:52 +0000 |
| commit | b2595c369f78b6613e329274f5ca7c43c4ddeda0 (patch) | |
| tree | 4db6ae8237692b570b6e5dad489f3da24c5aa3fe /indra/newview/llpanelpermissions.cpp | |
| parent | 84ea29c69c320573c7547f028b5325382e195cc6 (diff) | |
Merge sl-search-opt-in back into the release branch
Reviewed by Josh and Don
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index d0061e281e..133173b02d 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -84,6 +84,8 @@ BOOL LLPanelPermissions::postBuild() this->childSetCommitCallback("checkbox next owner can copy",LLPanelPermissions::onCommitNextOwnerCopy,this); this->childSetCommitCallback("checkbox next owner can transfer",LLPanelPermissions::onCommitNextOwnerTransfer,this); this->childSetCommitCallback("clickaction",LLPanelPermissions::onCommitClickAction,this); + this->childSetCommitCallback("search_check",LLPanelPermissions::onCommitIncludeInSearch,this); + LLTextBox* LabelGroupNameRectProxy = gUICtrlFactory->getTextBoxByName(this,"Group Name Proxy"); if(LabelGroupNameRectProxy ) @@ -197,6 +199,10 @@ void LLPanelPermissions::refresh() //checkbox for sale childSetValue("checkbox for sale",FALSE); childSetEnabled("checkbox for sale",false); + + //checkbox include in search + childSetValue("search_check", FALSE); + childSetEnabled("search_check", false); LLRadioGroup* RadioSaleType = gUICtrlFactory->getRadioGroupByName(this,"sale type"); if(RadioSaleType) @@ -730,8 +736,15 @@ void LLPanelPermissions::refresh() childSetTentative("checkbox for sale",false); } - // Click action (touch, sit, buy) + // Check search status of objects BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ); + bool include_in_search; + bool all_include_in_search = gSelectMgr->selectionGetIncludeInSearch(&include_in_search); + childSetEnabled("search_check", is_perm_modify && all_volume); + childSetValue("search_check", include_in_search); + childSetTentative("search_check", ! all_include_in_search); + + // Click action (touch, sit, buy) U8 click_action = 0; if (gSelectMgr->selectionGetClickAction(&click_action)) { @@ -1044,3 +1057,13 @@ void LLPanelPermissions::onCommitClickAction(LLUICtrl* ctrl, void*) } gSelectMgr->selectionSetClickAction(click_action); } + +// static +void LLPanelPermissions::onCommitIncludeInSearch(LLUICtrl* ctrl, void*) +{ + LLCheckBoxCtrl* box = (LLCheckBoxCtrl*)ctrl; + llassert(box); + + gSelectMgr->selectionSetIncludeInSearch(box->get()); +} + |