diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-11 18:57:13 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-12 12:32:01 +0800 |
| commit | 6530f56b97f57cb7d80bb916a2b15af0b7f6c425 (patch) | |
| tree | 024f7870252fe309ebdef3fbd4f2a34f1e9bc5ee /indra/newview/llmediactrl.h | |
| parent | 5704c81c1b6dc1da7ec3cfb5ee3979d0fc1db86d (diff) | |
| parent | 814d6d43f0720bda2e74a0ecedb560ad8fcf10a9 (diff) | |
Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 9f9564af46..5d3d8f3ba2 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -201,7 +201,6 @@ public: mStretchToFill, mMaintainAspectRatio, mHideLoading, - mHidingInitialLoad, mClearCache, mHoverTextChanged, mDecoupleTextureSize, |