summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-19 18:45:22 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-19 18:45:22 -0700
commiteedc8687b0d05a14e41f1601d2ee615c69d132d0 (patch)
tree0488609e24bd916bd8635d4bc6cad0383db028c4 /indra/newview
parent6d7ab5d1346a8c91563a83d0a5eee912d36a1488 (diff)
EXP-1364 FIX Debug console output covered by left toolbar buttons if present
EXP-1427 FIX Voice Settings dialog closes when selecting minimize option
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lldebugview.cpp9
-rw-r--r--indra/newview/lldebugview.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
index cc6ba05e7e..ba511a3693 100644
--- a/indra/newview/lldebugview.cpp
+++ b/indra/newview/lldebugview.cpp
@@ -147,3 +147,12 @@ LLDebugView::~LLDebugView()
gTextureCategoryView = NULL;
}
+void LLDebugView::draw()
+{
+ LLView* floater_snap_region = getRootView()->getChildView("floater_snap_region");
+ LLRect debug_rect;
+ floater_snap_region->localRectToOtherView(floater_snap_region->getLocalRect(), &debug_rect, getParent());
+
+ setShape(debug_rect);
+ LLView::draw();
+}
diff --git a/indra/newview/lldebugview.h b/indra/newview/lldebugview.h
index 20262fc89e..907a42c981 100644
--- a/indra/newview/lldebugview.h
+++ b/indra/newview/lldebugview.h
@@ -55,6 +55,7 @@ public:
~LLDebugView();
void init();
+ void draw();
void setStatsVisible(BOOL visible);