diff options
| author | Callum Prentice <callum@gmail.com> | 2020-06-02 13:13:53 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-06-02 13:13:53 -0700 |
| commit | d4a38abdf593a2f1f3cdf1de9bdbf043118cea3a (patch) | |
| tree | 6ec2f986f1f988f60cc0282136277fd046d05975 /indra/newview/llviewerwindow.cpp | |
| parent | a01f29761263314c21dd4905f05124f4c15df502 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
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 f64dfcf0d4..44d02b4224 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -5119,6 +5119,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) @@ -5172,7 +5180,6 @@ void LLViewerWindow::setProgressCancelButtonVisible( BOOL b, const std::string& } } - LLProgressView *LLViewerWindow::getProgressView() const { return mProgressView; |