diff options
| author | McCabe Maxsted | 2010-04-30 04:43:58 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:43:28 -0500 |
| commit | b9e1ca3150cb9553bfbb7a15c90761e9a400f6b9 (patch) | |
| tree | 2a99be246f51f7ba57f39857f89f7c6a2255c8fc /linden/indra/newview/llpanelface.h | |
| parent | Clarified the simulator version change chat message with some text (diff) | |
| download | meta-impy-b9e1ca3150cb9553bfbb7a15c90761e9a400f6b9.zip meta-impy-b9e1ca3150cb9553bfbb7a15c90761e9a400f6b9.tar.gz meta-impy-b9e1ca3150cb9553bfbb7a15c90761e9a400f6b9.tar.bz2 meta-impy-b9e1ca3150cb9553bfbb7a15c90761e9a400f6b9.tar.xz | |
Applied patch for SNOW-586 by Thickbrick Sleaford: Add option to align textures across (planar-mapped, co-planar) faces
Was accidentally left out of a rebase
Diffstat (limited to 'linden/indra/newview/llpanelface.h')
| -rw-r--r-- | linden/indra/newview/llpanelface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelface.h b/linden/indra/newview/llpanelface.h index 33c84c8..8e4d4db 100644 --- a/linden/indra/newview/llpanelface.h +++ b/linden/indra/newview/llpanelface.h | |||
| @@ -86,6 +86,7 @@ protected: | |||
| 86 | static void onCommitShiny( LLUICtrl* ctrl, void* userdata); | 86 | static void onCommitShiny( LLUICtrl* ctrl, void* userdata); |
| 87 | static void onCommitFullbright( LLUICtrl* ctrl, void* userdata); | 87 | static void onCommitFullbright( LLUICtrl* ctrl, void* userdata); |
| 88 | static void onCommitGlow( LLUICtrl* ctrl, void *userdata); | 88 | static void onCommitGlow( LLUICtrl* ctrl, void *userdata); |
| 89 | static void onCommitPlanarAlign( LLUICtrl* ctrl, void* userdata); | ||
| 89 | 90 | ||
| 90 | static void onClickApply(void*); | 91 | static void onClickApply(void*); |
| 91 | static void onClickAutoFix(void*); | 92 | static void onClickAutoFix(void*); |