diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:11:23 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:11:23 -0700 |
| commit | ed7fda069bcbf145a273b46cb2070c72d059acef (patch) | |
| tree | bddfc8f9a13d55ccb05c4a24bb3022c84197bf25 /indra/newview/llpanelface.h | |
| parent | f03b696c3dfd859cf92db27ae7c45248d0bf8d44 (diff) | |
| parent | e9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (diff) | |
Merge viewer-release 6.2.5
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 0b40d7d41a..2d57d89a44 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -126,6 +126,7 @@ protected: void sendFullbright(); // applies and sends full bright void sendGlow(); void sendMedia(); + void alignTestureLayer(); // this function is to return TRUE if the drag should succeed. static BOOL onDragTexture(LLUICtrl* ctrl, LLInventoryItem* item); @@ -202,6 +203,7 @@ protected: static void onCommitPlanarAlign( LLUICtrl* ctrl, void* userdata); static void onCommitRepeatsPerMeter( LLUICtrl* ctrl, void* userinfo); static void onClickAutoFix(void*); + static void onAlignTexture(void*); static F32 valueGlow(LLViewerObject* object, S32 face); |