diff options
| author | prep linden <prep@lindenlab.com> | 2011-09-16 15:45:56 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-09-16 15:45:56 -0400 |
| commit | 2aa385aeaf7ff57e19278f27fcf4c6a23f97ea30 (patch) | |
| tree | 5bfa7f59c354d59f5e565aafa226b4dcc835c214 /indra/newview/llsidetray.cpp | |
| parent | 1a7e1661040c9295c405e72e361307109514fc9b (diff) | |
| parent | ac918730bee5d2970e2df0edaa544168486e6e54 (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(); |