diff options
| author | Rye <rye@alchemyviewer.org> | 2026-01-21 15:33:19 -0500 |
|---|---|---|
| committer | Rye <rye@alchemyviewer.org> | 2026-01-21 16:05:51 -0500 |
| commit | 8896239134a40f41d845c78551d24e005d691d7c (patch) | |
| tree | b5f823454cf491c4a83ecc8cf987cf465854ca30 /indra/newview/llviewerwindow.cpp | |
| parent | d0db6a49eb7c7dddcde2a340c8ad6c1f1af6e2cf (diff) | |
| parent | 0b2f7fcc6b67f629b41a804f77214d51497127a7 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop-linux
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a3c241456d..773ff14e90 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2067,10 +2067,6 @@ void LLViewerWindow::initGLDefaults() gBox.prerender(); } -struct MainPanel : public LLPanel -{ -}; - void LLViewerWindow::initBase() { S32 height = getWindowHeightScaled(); @@ -2109,6 +2105,8 @@ void LLViewerWindow::initBase() main_view->setShape(full_window); getRootView()->addChild(main_view); + mMainView = main_view; + // placeholder widget that controls where "world" is rendered mWorldViewPlaceholder = main_view->getChildView("world_view_rect")->getHandle(); mPopupView = main_view->getChild<LLPopupView>("popup_holder"); |