Merge remote branch 'develop' into marchcat/xcode-16

1 files changed, 3 insertions, 1 deletions

diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h
index 224677736c..4c850e2d91 100644
--- a/indra/newview/llhudtext.h
+++ b/indra/newview/llhudtext.h
@@ -67,6 +67,8 @@ protected:
         LLColor4                mColor;
         LLFontGL::StyleFlags    mStyle;
         const LLFontGL*         mFont;
+        LLFontVertexBuffer      mFontBuffer;
+        LLFontVertexBuffer      mFontBufferText;
     private:
         LLWString               mText;
         std::map<const LLFontGL*, F32> mFontWidthMap;
@@ -152,6 +154,7 @@ private:
     const LLFontGL* mBoldFontp;
     LLRectf         mSoftScreenRect;
     LLVector3       mPositionAgent;
+    LLVector3       mLastRenderPosition;
     LLVector2       mPositionOffset;
     LLVector2       mTargetPositionOffset;
     F32             mMass;
@@ -162,7 +165,6 @@ private:
     ETextAlignment  mTextAlignment;
     EVertAlignment  mVertAlignment;
     bool            mHidden;
-    LLFontVertexBuffer   mFontBuffer;
 
     static bool    sDisplayText ;
     static std::set<LLPointer<LLHUDText> > sTextObjects;