From b5346c6b64ce955ed71ddc6f64bc7a864111a8e4 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 1 Dec 2011 15:46:39 -0800
Subject: [PATCH] SH-2726 FIX -- Texture Console and Debug Console inaccessable
* Removed debug view post build step and moved initialization to first draw for proper setup.
---
indra/newview/lldebugview.cpp | 12 +++++-------
indra/newview/lldebugview.h | 2 --
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
index 92ac336d0db..7d3170cb765 100644
--- a/indra/newview/lldebugview.cpp
+++ b/indra/newview/lldebugview.cpp
@@ -72,13 +72,6 @@ LLDebugView::~LLDebugView()
gTextureCategoryView = NULL;
}
-BOOL LLDebugView::postBuild()
-{
- mFloaterSnapRegion = getRootView()->getChildView("floater_snap_region");
-
- return TRUE;
-}
-
void LLDebugView::init()
{
LLRect r;
@@ -157,6 +150,11 @@ void LLDebugView::init()
void LLDebugView::draw()
{
+ if (mFloaterSnapRegion == NULL)
+ {
+ mFloaterSnapRegion = getRootView()->getChildView("floater_snap_region");
+ }
+
LLRect debug_rect;
mFloaterSnapRegion->localRectToOtherView(mFloaterSnapRegion->getLocalRect(), &debug_rect, getParent());
diff --git a/indra/newview/lldebugview.h b/indra/newview/lldebugview.h
index 33d6a7394f5..5aec77ad627 100644
--- a/indra/newview/lldebugview.h
+++ b/indra/newview/lldebugview.h
@@ -55,8 +55,6 @@ class LLDebugView : public LLView
LLDebugView(const Params&);
~LLDebugView();
- BOOL postBuild();
-
void init();
void draw();
--
GitLab