diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
| commit | 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 (patch) | |
| tree | 19f051897838d5a75e5ce1e776bb52a330173171 /indra/newview/llpanelpermissions.cpp | |
| parent | fc664e93e62645fc6e9659664351e77f3c4b374f (diff) | |
merge release@56803 release-candidate@56833
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |