diff options
| author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-04-08 11:40:10 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-04-08 11:40:10 -0700 |
| commit | bd3716b7758ab27f929da1608260eafd4212c5d8 (patch) | |
| tree | 38e81d6301e8e05f8f2a35f5568ff2dbb4cdfc48 /indra/newview/llpanelface.h | |
| parent | 27fbf5efc9192813e5109443c60bfc26f99716ee (diff) | |
NORSPEC-82 NORSPEC-85 More UI shenanigans
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 + |