diff options
Diffstat (limited to 'indra/newview/lllistcontextmenu.cpp')
| -rw-r--r-- | indra/newview/lllistcontextmenu.cpp | 110 | 
1 files changed, 55 insertions, 55 deletions
diff --git a/indra/newview/lllistcontextmenu.cpp b/indra/newview/lllistcontextmenu.cpp index 77185411c5..cf29fd0483 100644 --- a/indra/newview/lllistcontextmenu.cpp +++ b/indra/newview/lllistcontextmenu.cpp @@ -1,25 +1,25 @@ -/**  +/**   * @file lllistcontextmenu.cpp   * @brief Base class of misc lists' context menus   *   * $LicenseInfo:firstyear=2010&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2010, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ @@ -41,74 +41,74 @@ LLListContextMenu::LLListContextMenu()  LLListContextMenu::~LLListContextMenu()  { -	// do not forget delete LLContextMenu* mMenu. -	// It can have registered Enable callbacks which are called from the LLMenuHolderGL::draw() -	// via selected item (menu_item_call) by calling LLMenuItemCallGL::buildDrawLabel. -	// we can have a crash via using callbacks of deleted instance of ContextMenu. EXT-4725 - -	// menu holder deletes its menus on viewer exit, so we have no way to determine if instance -	// of mMenu has already been deleted except of using LLHandle. EXT-4762. -	if (!mMenuHandle.isDead()) -	{ -		mMenuHandle.get()->die(); -		mMenuHandle.markDead(); -	} +    // do not forget delete LLContextMenu* mMenu. +    // It can have registered Enable callbacks which are called from the LLMenuHolderGL::draw() +    // via selected item (menu_item_call) by calling LLMenuItemCallGL::buildDrawLabel. +    // we can have a crash via using callbacks of deleted instance of ContextMenu. EXT-4725 + +    // menu holder deletes its menus on viewer exit, so we have no way to determine if instance +    // of mMenu has already been deleted except of using LLHandle. EXT-4762. +    if (!mMenuHandle.isDead()) +    { +        mMenuHandle.get()->die(); +        mMenuHandle.markDead(); +    }  }  void LLListContextMenu::show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y)  { -	LLContextMenu* menup = mMenuHandle.get(); -	if (menup) -	{ -		menup->die(); -		mMenuHandle.markDead(); -		mUUIDs.clear(); -	} - -	if ( uuids.empty() ) -	{ -		return; -	} - -	mUUIDs.resize(uuids.size()); -	std::copy(uuids.begin(), uuids.end(), mUUIDs.begin()); - -	menup = createMenu(); -	if (!menup) -	{ -		LL_WARNS() << "Context menu creation failed" << LL_ENDL; -		return; -	} - -	mMenuHandle = menup->getHandle(); -	menup->show(x, y); -	LLMenuGL::showPopup(spawning_view, menup, x, y); +    LLContextMenu* menup = mMenuHandle.get(); +    if (menup) +    { +        menup->die(); +        mMenuHandle.markDead(); +        mUUIDs.clear(); +    } + +    if ( uuids.empty() ) +    { +        return; +    } + +    mUUIDs.resize(uuids.size()); +    std::copy(uuids.begin(), uuids.end(), mUUIDs.begin()); + +    menup = createMenu(); +    if (!menup) +    { +        LL_WARNS() << "Context menu creation failed" << LL_ENDL; +        return; +    } + +    mMenuHandle = menup->getHandle(); +    menup->show(x, y); +    LLMenuGL::showPopup(spawning_view, menup, x, y);  }  void LLListContextMenu::hide()  { -	if(mMenuHandle.get()) -	{ -		mMenuHandle.get()->hide(); -	} +    if(mMenuHandle.get()) +    { +        mMenuHandle.get()->hide(); +    }  }  // static  void LLListContextMenu::handleMultiple(functor_t functor, const uuid_vec_t& ids)  { -	uuid_vec_t::const_iterator it; -	for (it = ids.begin(); it != ids.end(); ++it) -	{ -		functor(*it); -	} +    uuid_vec_t::const_iterator it; +    for (it = ids.begin(); it != ids.end(); ++it) +    { +        functor(*it); +    }  }  // static  LLContextMenu* LLListContextMenu::createFromFile(const std::string& filename)  { -	llassert(LLMenuGL::sMenuContainer != NULL); -	return LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>( -		filename, LLContextMenu::sMenuContainer, LLViewerMenuHolderGL::child_registry_t::instance()); +    llassert(LLMenuGL::sMenuContainer != NULL); +    return LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>( +        filename, LLContextMenu::sMenuContainer, LLViewerMenuHolderGL::child_registry_t::instance());  }  // EOF  | 
