diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
| commit | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (patch) | |
| tree | b6fc95044fc41cdc43969195f9c1939e8ecb0158 /indra/newview/llpanelface.cpp | |
| parent | dd2ede9991a9a31821fbe43a7fa17a5aafa19542 (diff) | |
| parent | 7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff) | |
merge changes for 3.6.0-materials-beta1
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index b7dc838601..dcedbba81b 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -960,11 +960,11 @@ void LLPanelFace::updateUI() } } - if (shinytexture_ctrl && !shinytexture_ctrl->isPickerShown()) + if (shinytexture_ctrl) { // Can't use this test as we can't actually store SHINY_TEXTURE in the TEs *sigh* // - if (identical_spec /*&& (shiny == SHINY_TEXTURE)*/) + if (identical_spec && (shiny == SHINY_TEXTURE)) { shinytexture_ctrl->setTentative( FALSE ); shinytexture_ctrl->setEnabled( editable ); |