diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
| commit | 9488baada3c0aec7cfa4256708fdda82861cd502 (patch) | |
| tree | 1f71293b54161733269a6f340574ec4960623d0f /indra/newview/llpanelface.cpp | |
| parent | de08d74dc6da594c20aed3673114cbc0ef6d3305 (diff) | |
| parent | 1869a399beb2cb3fa52d21f9c288f4c3b6ab4deb (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 3e29805446..202be9671b 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -490,7 +490,7 @@ void LLPanelFace::getState() && objectp->getPCode() == LL_PCODE_VOLUME && objectp->permModify()) { - BOOL editable = objectp->permModify(); + BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced(); // only turn on auto-adjust button if there is a media renderer and the media is loaded getChildView("textbox autofix")->setEnabled(editable); |