diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 21:41:03 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 21:41:03 -0400 |
commit | 7f10e89ce919ad35907cd4237a78b831375ffb75 (patch) | |
tree | 8b4da654d8af8c4c671c8fd1df4fba658909175a /indra/newview/llsidetray.cpp | |
parent | 4b269f67ea8d053b4c05a9c002811901c8ec8a49 (diff) | |
parent | c1f211cac1a4aa84bb538cfdcaa3b9190c43eb0c (diff) |
merge
Diffstat (limited to 'indra/newview/llsidetray.cpp')
-rw-r--r-- | indra/newview/llsidetray.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index f53b08a4bc..0d28b3c042 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -685,7 +685,6 @@ LLSideTrayTab* LLSideTray::getTab(const std::string& name) bool LLSideTray::isTabAttached(const std::string& name) { LLSideTrayTab* tab = getTab(name); - llassert(tab); if (!tab) return false; return std::find(mTabs.begin(), mTabs.end(), tab) != mTabs.end(); |