Merge branch '2024.12-ForeverFPS'

1 files changed, 7 insertions, 19 deletions

diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
index 15b04a8eb9..250ee511d7 100644
--- a/indra/newview/llprogressview.h
+++ b/indra/newview/llprogressview.h
@@ -53,7 +53,6 @@ public:
 
     /*virtual*/ void draw();
     void drawStartTexture(F32 alpha);
-    void drawLogos(F32 alpha);
 
     /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask);
     /*virtual*/ bool handleKeyHere(KEY key, MASK mask);
@@ -86,7 +85,6 @@ public:
 protected:
     LLProgressBar* mProgressBar;
     LLMediaCtrl* mMediaCtrl;
-    LLTextBox* mLogosLabel = nullptr;
     LLTextBox* mProgressText = nullptr;
     LLTextBox* mMessageText = nullptr;
     F32 mPercentDone;
@@ -95,6 +93,13 @@ protected:
     LLFrameTimer mFadeToWorldTimer;
     LLFrameTimer mFadeFromLoginTimer;
     LLRect mOutlineRect;
+    LLView* mLayoutPanel4 = nullptr;
+    LLView* mLayoutMOTD = nullptr;
+    // Rects for resizing purposes
+    LLRect mMessageTextRectInitial;
+    LLRect mLayoutPanel4RectInitial;
+    LLRect mLayoutMOTDRectInitial;
+
     bool mMouseDownInActiveArea;
     bool mStartupComplete;
 
@@ -105,25 +110,8 @@ protected:
 
     bool handleUpdate(const LLSD& event_data);
     static void onIdle(void* user_data);
-    void loadLogo(const std::string &path, const U8 image_codec, const LLRect &pos_rect, const LLRectf &clip_rect, const LLRectf &offset_rect);
-    // logos have unusual location and need to be preloaded to not appear grey, then deleted
-    void initLogos();
     // Loads a bitmap to display during load
     void initStartTexture(S32 location_id, bool is_in_production);
-
-private:
-    // We need to draw textures on login, but only once.
-    // So this vector gets filled up for textures to render and gets cleaned later
-    // Some textures have unusual requirements, so we are rendering directly
-    class TextureData
-    {
-    public:
-        LLPointer<LLViewerTexture> mTexturep;
-        LLRect mDrawRect;
-        LLRectf mClipRect;
-        LLRectf mOffsetRect;
-    };
-    std::vector<TextureData> mLogosList;
 };
 
 #endif // LL_LLPROGRESSVIEW_H