merge changes for storm-1595

meow-7.2.2
Oz Linden 2011-09-15 15:27:42 -04:00
commit daf0b047fa
1 changed files with 0 additions and 1 deletions

View File

@ -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();