diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-15 15:27:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-15 15:27:42 -0400 |
| commit | daf0b047faa5b8fd82de5a77aa098eb7f0cdca0f (patch) | |
| tree | 8c786c2625344bbef3c170e921abfa256d88c833 | |
| parent | d3c05d52e5b26084280f048de9e321e3bb6b5ece (diff) | |
| parent | a21aa5509d1c1069a3562b7339f4d22ae927110d (diff) | |
merge changes for storm-1595
| -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(); |