summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-04 17:37:57 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-04 17:37:57 -0800
commit9c8f6ba6a51b799d16e89e995bbcf3b0dcc15c62 (patch)
treec675116dcd983657ee04a1cdd122be2f8ed32638 /indra
parent990b5aea2b92ac8c06651ad94db9506a42ba1be0 (diff)
Modified CRASH assert to not occur in release mode per Richard
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 1529381773..542f57ee5f 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)
{