diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 21:36:39 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 21:36:39 -0400 |
| commit | 1a0865a57220434a49b106a47170c3dae45dcb13 (patch) | |
| tree | bbdc26e1e68bd1c09ac0c5e906f9a89266b5b165 /indra/newview/llsidetray.cpp | |
| parent | 92fa144dcea4cbb6426b895cf5359da0c90eb4ae (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(); |