summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-05 09:44:19 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-05 09:44:19 -0800
commit12819b6637aceb3a447742e255ec9f35ccde03d6 (patch)
tree49db672561dffd92bdc49db2a9e68c8ce4bb42c9 /indra
parent46ac2341debf30264960c3ffe0082e9960910529 (diff)
parent9c8f6ba6a51b799d16e89e995bbcf3b0dcc15c62 (diff)
Latest from viewer-experience
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index b86d4d0d09..61c80bab51 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -282,7 +282,8 @@ void LLView::moveChildToBackOfTabGroup(LLUICtrl* child)
// virtual
bool LLView::addChild(LLView* child, S32 tab_group)
{
- llassert_always(mInDraw == false);
+ // NOTE: Changed this to not crash in release mode
+ llassert(mInDraw == false);
if (!child)
{