diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-07-16 19:22:02 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-07-16 19:22:02 +0300 |
| commit | 72581ab99d2e891821f5266330ecd8a58a277eb7 (patch) | |
| tree | 528629c8943a400bc1a6186b49cdabdb4b8ed507 /indra/newview/lldebugview.cpp | |
| parent | f5e788b1b4ff5fb45f20ee5fa5daad7cca42069f (diff) | |
| parent | 1577ca1724787fdc0f0317ade3dab8ea3c5df7e7 (diff) | |
Merge branch 'release/26.3' into marchcat/slua-26.3
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/newview/CMakeLists.txt
# indra/newview/featuretable.txt
# indra/newview/featuretable_linux.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llvoavatar.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/newview/lldebugview.cpp')
| -rw-r--r-- | indra/newview/lldebugview.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index 53da9826ed..246a9d28e4 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -38,7 +38,6 @@ #include "llappviewer.h" #include "llsceneview.h" #include "llviewertexture.h" -#include "llfloaterreg.h" #include "llscenemonitor.h" // // Globals @@ -53,7 +52,6 @@ static LLDefaultChildRegistry::Register<LLDebugView> r("debug_view"); LLDebugView::LLDebugView(const LLDebugView::Params& p) : LLView(p), - mFastTimerView(NULL), mDebugConsolep(NULL), mFloaterSnapRegion(NULL) {} @@ -89,8 +87,6 @@ void LLDebugView::init() r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f)); - mFastTimerView = dynamic_cast<LLFastTimerView*>(LLFloaterReg::getInstance("block_timers")); - gSceneView = new LLSceneView(r); gSceneView->setFollowsTop(); gSceneView->setFollowsLeft(); @@ -105,7 +101,7 @@ void LLDebugView::init() addChild(gSceneMonitorView); gSceneMonitorView->setRect(rect); - r.set(150, rect.getHeight() - 60, 820, 110); + r.set(150, rect.getHeight() - 60, 835, 110); LLTextureView::Params tvp; tvp.name("gTextureView"); tvp.rect(r); |