diff options
Diffstat (limited to 'indra/newview/llsidepaneltaskinfo.cpp')
| -rw-r--r-- | indra/newview/llsidepaneltaskinfo.cpp | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 403ca7bcbf..f73722521a 100644 --- a/indra/newview/llsidepaneltaskinfo.cpp +++ b/indra/newview/llsidepaneltaskinfo.cpp @@ -124,30 +124,24 @@ BOOL LLSidepanelTaskInfo::postBuild() childSetCommitCallback("search_check", &LLSidepanelTaskInfo::onCommitIncludeInSearch,this); mDAPermModify = getChild<LLUICtrl>("perm_modify"); - mDACreator = getChildView("Creator:"); mDACreatorName = getChild<LLUICtrl>("Creator Name"); mDAOwner = getChildView("Owner:"); mDAOwnerName = getChild<LLUICtrl>("Owner Name"); - mDAGroup = getChildView("Group:"); - mDAGroupName = getChild<LLUICtrl>("Group Name"); mDAButtonSetGroup = getChildView("button set group"); mDAObjectName = getChild<LLUICtrl>("Object Name"); mDAName = getChildView("Name:"); mDADescription = getChildView("Description:"); mDAObjectDescription = getChild<LLUICtrl>("Object Description"); - mDAPermissions = getChildView("Permissions:"); mDACheckboxShareWithGroup = getChild<LLUICtrl>("checkbox share with group"); mDAButtonDeed = getChildView("button deed"); mDACheckboxAllowEveryoneMove = getChild<LLUICtrl>("checkbox allow everyone move"); mDACheckboxAllowEveryoneCopy = getChild<LLUICtrl>("checkbox allow everyone copy"); - mDANextOwnerCan = getChildView("Next owner can:"); mDACheckboxNextOwnerCanModify = getChild<LLUICtrl>("checkbox next owner can modify"); mDACheckboxNextOwnerCanCopy = getChild<LLUICtrl>("checkbox next owner can copy"); mDACheckboxNextOwnerCanTransfer = getChild<LLUICtrl>("checkbox next owner can transfer"); mDACheckboxForSale = getChild<LLUICtrl>("checkbox for sale"); mDASearchCheck = getChild<LLUICtrl>("search_check"); mDAComboSaleType = getChild<LLComboBox>("sale type"); - mDACost = getChild<LLUICtrl>("Cost"); mDAEditCost = getChild<LLUICtrl>("Edit Cost"); mDALabelClickAction = getChildView("label click action"); mDAComboClickAction = getChild<LLComboBox>("clickaction"); @@ -183,7 +177,6 @@ void LLSidepanelTaskInfo::disableAll() mDAPermModify->setEnabled(FALSE); mDAPermModify->setValue(LLStringUtil::null); - mDACreator->setEnabled(FALSE); mDACreatorName->setValue(LLStringUtil::null); mDACreatorName->setEnabled(FALSE); @@ -191,21 +184,14 @@ void LLSidepanelTaskInfo::disableAll() mDAOwnerName->setValue(LLStringUtil::null); mDAOwnerName->setEnabled(FALSE); - mDAGroup->setEnabled(FALSE); - mDAGroupName->setValue(LLStringUtil::null); - mDAGroupName->setEnabled(FALSE); mDAButtonSetGroup->setEnabled(FALSE); mDAObjectName->setValue(LLStringUtil::null); mDAObjectName->setEnabled(FALSE); mDAName->setEnabled(FALSE); - mDAGroupName->setValue(LLStringUtil::null); - mDAGroupName->setEnabled(FALSE); mDADescription->setEnabled(FALSE); mDAObjectDescription->setValue(LLStringUtil::null); mDAObjectDescription->setEnabled(FALSE); - - mDAPermissions->setEnabled(FALSE); mDACheckboxShareWithGroup->setValue(FALSE); mDACheckboxShareWithGroup->setEnabled(FALSE); @@ -217,7 +203,6 @@ void LLSidepanelTaskInfo::disableAll() mDACheckboxAllowEveryoneCopy->setEnabled(FALSE); //Next owner can: - mDANextOwnerCan->setEnabled(FALSE); mDACheckboxNextOwnerCanModify->setValue(FALSE); mDACheckboxNextOwnerCanModify->setEnabled(FALSE); mDACheckboxNextOwnerCanCopy->setValue(FALSE); @@ -235,9 +220,7 @@ void LLSidepanelTaskInfo::disableAll() mDAComboSaleType->setValue(LLSaleInfo::FS_COPY); mDAComboSaleType->setEnabled(FALSE); - - mDACost->setEnabled(FALSE); - mDACost->setValue(getString("Cost Default")); + mDAEditCost->setValue(LLStringUtil::null); mDAEditCost->setEnabled(FALSE); @@ -365,8 +348,6 @@ void LLSidepanelTaskInfo::refresh() mDAPathfindingAttributes->setEnabled(TRUE); mDAPathfindingAttributes->setValue(LLTrans::getString(pfAttrName)); - - getChildView("Permissions:")->setEnabled(TRUE); // Update creator text field getChildView("Creator:")->setEnabled(TRUE); @@ -698,7 +679,6 @@ void LLSidepanelTaskInfo::refresh() getChild<LLUICtrl>("checkbox for sale")->setTentative( is_for_sale_mixed); getChildView("sale type")->setEnabled(num_for_sale && can_transfer && !is_sale_price_mixed); - getChildView("Next owner can:")->setEnabled(TRUE); getChildView("checkbox next owner can modify")->setEnabled(base_mask_on & PERM_MODIFY); getChildView("checkbox next owner can copy")->setEnabled(base_mask_on & PERM_COPY); getChildView("checkbox next owner can transfer")->setEnabled(next_owner_mask_on & PERM_COPY); @@ -708,7 +688,6 @@ void LLSidepanelTaskInfo::refresh() getChildView("checkbox for sale")->setEnabled(FALSE); getChildView("sale type")->setEnabled(FALSE); - getChildView("Next owner can:")->setEnabled(FALSE); getChildView("checkbox next owner can modify")->setEnabled(FALSE); getChildView("checkbox next owner can copy")->setEnabled(FALSE); getChildView("checkbox next owner can transfer")->setEnabled(FALSE); |