diff options
| author | Geenz <geenz@geenzo.com> | 2013-04-09 15:41:37 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-04-09 15:41:37 -0400 |
| commit | 356d738250a872663692876796c043cd04f87d44 (patch) | |
| tree | 29ee38c2c4152994ac2c84dfa99650246f0d51b4 /indra/newview/llpanelface.h | |
| parent | e4faf91bb20c33cba5b060064f03da5f1e863984 (diff) | |
| parent | 2a220ca9eb22f953073c6396167dbd48648fe5f9 (diff) | |
Merged with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index a99b4e772f..2138319365 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -93,8 +93,8 @@ protected: static void onCommitMaterialType( LLUICtrl* ctrl, void* userdata); static void onCommitBump( LLUICtrl* ctrl, void* userdata); static void onCommitTexGen( LLUICtrl* ctrl, void* userdata); - static void updateShinyControls( LLUICtrl* ctrl, void* userdata); - static void updateBumpyControls( LLUICtrl* ctrl, void* userdata); + static void updateShinyControls( LLUICtrl* ctrl, void* userdata, bool mess_with_combobox = false); + static void updateBumpyControls( LLUICtrl* ctrl, void* userdata, bool mess_with_combobox = false); static void onCommitShiny( LLUICtrl* ctrl, void* userdata); static void updateAlphaControls( LLUICtrl* ctrl, void* userdata); static void onCommitAlphaMode( LLUICtrl* ctrl, void* userdata); @@ -134,3 +134,4 @@ private: }; #endif + |