diff options
author | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
commit | dbe965eaa1864ff71e365608488a5015172a24ed (patch) | |
tree | f3a7f10360a50a09ca1267fd204802507b079a17 /indra/newview/llpanelcontents.cpp | |
parent | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff) | |
parent | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff) |
Sync with viewer-development
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
-rw-r--r-- | indra/newview/llpanelcontents.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index 3952e80962..bf3bf38863 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -107,7 +107,7 @@ void LLPanelContents::getState(LLViewerObject *objectp ) { if( !objectp ) { - childSetEnabled("button new script",FALSE); + getChildView("button new script")->setEnabled(FALSE); return; } @@ -121,7 +121,7 @@ void LLPanelContents::getState(LLViewerObject *objectp ) BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); // Edit script button - ok if object is editable and there's an unambiguous destination for the object. - childSetEnabled("button new script", + getChildView("button new script")->setEnabled( editable && all_volume && ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1) |