From 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 17 Jan 2007 23:02:00 +0000 Subject: merge release@56803 release-candidate@56833 --- indra/newview/llpanelpermissions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelpermissions.cpp') diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 9e23b977d9..d3642838b2 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -137,11 +137,11 @@ void LLPanelPermissions::refresh() root_selected = FALSE; } - BOOL attachment_selected = gSelectMgr->selectionIsAttachment(); - + //BOOL attachment_selected = gSelectMgr->selectionIsAttachment(); + //attachment_selected = false; LLViewerObject* objectp = NULL; if(nodep) objectp = nodep->getObject(); - if(!nodep || !objectp || attachment_selected) + if(!nodep || !objectp)// || attachment_selected) { // ...nothing selected childSetEnabled("perm_modify",false); -- cgit v1.2.3