summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2021-09-29 16:50:57 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2021-09-29 16:50:57 +0100
commit19154bec157a4e05c8b988531e84095a8124d3ec (patch)
treef09c2641c65ef410117eb2344ce3454154630080 /indra/newview/llviewerwindow.cpp
parent3c4198e4b50de0221020f3b5bbf7d3f7ff7cf984 (diff)
parent391500b5f7f2fb251acdd192d80e1da7eea02c4c (diff)
Merge branch 'SL-15999' of ssh://bitbucket.org/lindenlab/viewer into SL-15999
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 22279d0bf0..bd22127a45 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2195,6 +2195,13 @@ void LLViewerWindow::initBase()
void LLViewerWindow::initWorldUI()
{
+ if (gNonInteractive)
+ {
+ gIMMgr = LLIMMgr::getInstance();
+ gFloaterView->pushVisibleAll(FALSE);
+ return;
+ }
+
S32 height = mRootView->getRect().getHeight();
S32 width = mRootView->getRect().getWidth();
LLRect full_window(0, height, width, 0);