diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:03:25 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:03:25 +0300 |
| commit | 2171d7fbd9bae72dac450153dd6d0071c76dedcf (patch) | |
| tree | 0a330c86a858536611f51306c62fe0660c850f69 /indra/newview/llviewerwindow.cpp | |
| parent | 882d7eee8091a9aa5557513626a009de99fd7ba4 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' into DRTVWR-501-maint
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 795396fd54..19c0c2d285 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -5121,6 +5121,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) @@ -5174,7 +5182,6 @@ void LLViewerWindow::setProgressCancelButtonVisible( BOOL b, const std::string& } } - LLProgressView *LLViewerWindow::getProgressView() const { return mProgressView; |