summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.h
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-11-16 17:53:18 -0800
committerMonroe Linden <monroe@lindenlab.com>2009-11-16 17:53:18 -0800
commit27a555e443c98ce1a41ef21e6111bdfe903894e8 (patch)
tree6b926bc88089d8e3dcdcc7143b9e424173a68cba /indra/newview/llmediactrl.h
parentd504efe3018bd0ce616e67c30b0bb31f5637973a (diff)
Hopefully the final fix for DEV-42800 (white flash at login).
Reinstated the hide_loading parameter to LLMediaCtrl, and made it cause LLMediaCtrl::draw() to early-exit between creating the LLViewerMediaImpl and receiving the initial MEDIA_EVENT_NAVIGATE_COMPLETE.
Diffstat (limited to 'indra/newview/llmediactrl.h')
-rw-r--r--indra/newview/llmediactrl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 76ddc61ebf..f07513a3fd 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -188,6 +188,7 @@ public:
bool mStretchToFill;
bool mMaintainAspectRatio;
bool mHideLoading;
+ bool mHidingInitialLoad;
bool mDecoupleTextureSize;
S32 mTextureWidth;
S32 mTextureHeight;