diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 10:18:56 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 10:18:56 -0600 |
| commit | ba6a0f3f332ffc659b00ca4c298b96efe56c6b81 (patch) | |
| tree | a543deec1323c4dc1cc42207277d0c47bbebdb66 /indra/newview/llviewerwindow.cpp | |
| parent | b84e79e0f206ac49aa57c4ad2d8d3dd7b5d2fc4d (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' 6.4.4 into DRTVWR-510
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 09f86ae391..d8802d98a9 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -5235,6 +5235,14 @@ void LLViewerWindow::revealIntroPanel() } } +void LLViewerWindow::initTextures(S32 location_id) +{ + if (mProgressView) + { + mProgressView->initTextures(location_id, LLGridManager::getInstance()->isInProductionGrid()); + } +} + void LLViewerWindow::setShowProgress(const BOOL show) { if (mProgressView) @@ -5288,7 +5296,6 @@ void LLViewerWindow::setProgressCancelButtonVisible( BOOL b, const std::string& } } - LLProgressView *LLViewerWindow::getProgressView() const { return mProgressView; |