diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-14 21:02:28 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-14 21:02:28 -0400 |
| commit | 094dcc07f8c1d90ae723dbe60eddacb90a09eae8 (patch) | |
| tree | e750942e5f22ed677b543bd49509c2a7cdc5ce56 /indra/newview/llviewertextureanim.h | |
| parent | d4043d3b011c32eb503c43c551872f9c24d7344f (diff) | |
| parent | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (diff) | |
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X
Diffstat (limited to 'indra/newview/llviewertextureanim.h')
| -rw-r--r-- | indra/newview/llviewertextureanim.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/indra/newview/llviewertextureanim.h b/indra/newview/llviewertextureanim.h index abbfabceb9..8a830d3f35 100644 --- a/indra/newview/llviewertextureanim.h +++ b/indra/newview/llviewertextureanim.h @@ -1,25 +1,25 @@ -/** +/** * @file llviewertextureanim.h * @brief LLViewerTextureAnim class header file * * $LicenseInfo:firstyear=2003&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -35,33 +35,33 @@ class LLVOVolume; class LLViewerTextureAnim : public LLTextureAnim { private: - static std::vector<LLViewerTextureAnim*> sInstanceList; - S32 mInstanceIndex; + static std::vector<LLViewerTextureAnim*> sInstanceList; + S32 mInstanceIndex; public: - static void updateClass(); + static void updateClass(); - LLViewerTextureAnim(LLVOVolume* vobj); - virtual ~LLViewerTextureAnim(); + LLViewerTextureAnim(LLVOVolume* vobj); + virtual ~LLViewerTextureAnim(); - /*virtual*/ void reset(); + /*virtual*/ void reset(); - S32 animateTextures(F32 &off_s, F32 &off_t, F32 &scale_s, F32 &scale_t, F32 &rotate); - enum - { - TRANSLATE = 0x01 // Result code JUST for animateTextures - }; + S32 animateTextures(F32 &off_s, F32 &off_t, F32 &scale_s, F32 &scale_t, F32 &rotate); + enum + { + TRANSLATE = 0x01 // Result code JUST for animateTextures + }; - F32 mOffS; - F32 mOffT; - F32 mScaleS; - F32 mScaleT; - F32 mRot; + F32 mOffS; + F32 mOffT; + F32 mScaleS; + F32 mScaleT; + F32 mRot; protected: - LLVOVolume* mVObj; - LLFrameTimer mTimer; - F64 mLastTime; - F32 mLastFrame; + LLVOVolume* mVObj; + LLFrameTimer mTimer; + F64 mLastTime; + F32 mLastFrame; }; #endif |