summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-19 10:32:38 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-19 10:32:38 -0500
commite60d95acf14bcf98c86a4694e9a56433cf074182 (patch)
tree599f2026692d3f0d3ec198dd53fe7ac218974acf /indra/llui
parent60a9c8d7abe102cefeb72666b9645a6dd34e84b8 (diff)
parentc0fffdea8812e5eed8da9f341d3bfc9590301ada (diff)
merge
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 542f57ee5f..7abe4ecd9f 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -283,7 +283,7 @@ void LLView::moveChildToBackOfTabGroup(LLUICtrl* child)
bool LLView::addChild(LLView* child, S32 tab_group)
{
// NOTE: Changed this to not crash in release mode
- llassert(mInDraw == false);
+ //llassert(mInDraw == false);
if (!child)
{