summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelcontents.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-11-26 14:45:30 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-11-26 14:45:30 +0200
commit300f6f8b8e74fb5538beeb39b88ee9bccf9e8129 (patch)
treeadddad9a1a0096aaad26c4066f883228b1197c5d /indra/newview/llpanelcontents.cpp
parent7d93032f08f134ba39a9008be7c0ee20db7ac59c (diff)
Revert "SL-13463 Add 'Reset scripts' button to Content tab of Build floater"
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
-rw-r--r--indra/newview/llpanelcontents.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index 116b23e595..3bae0cebfb 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -54,7 +54,6 @@
#include "lltrans.h"
#include "llviewerassettype.h"
#include "llviewerinventory.h"
-#include "llviewermenu.h"
#include "llviewerobject.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
@@ -83,7 +82,6 @@ BOOL LLPanelContents::postBuild()
childSetAction("button new script",&LLPanelContents::onClickNewScript, this);
childSetAction("button permissions",&LLPanelContents::onClickPermissions, this);
- childSetAction("btn_reset_scripts", &LLPanelContents::onClickResetScripts, this);
mPanelInventoryObject = getChild<LLPanelObjectInventory>("contents_inventory");
@@ -108,7 +106,6 @@ void LLPanelContents::getState(LLViewerObject *objectp )
if( !objectp )
{
getChildView("button new script")->setEnabled(FALSE);
- getChildView("btn_reset_scripts")->setEnabled(FALSE);
return;
}
@@ -128,8 +125,6 @@ void LLPanelContents::getState(LLViewerObject *objectp )
((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1)
|| (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)));
- getChildView("btn_reset_scripts")->setEnabled(editable);
-
getChildView("button permissions")->setEnabled(!objectp->isPermanentEnforced());
mPanelInventoryObject->setEnabled(!objectp->isPermanentEnforced());
}
@@ -211,9 +206,3 @@ void LLPanelContents::onClickPermissions(void *userdata)
LLPanelContents* self = (LLPanelContents*)userdata;
gFloaterView->getParentFloater(self)->addDependentFloater(LLFloaterReg::showInstance("bulk_perms"));
}
-
-// static
-void LLPanelContents::onClickResetScripts(void *userdata)
-{
- handle_selected_script_action("reset");
-}