From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/llavatarlist.cpp | 680 ++++++++++++++++++++--------------------- 1 file changed, 340 insertions(+), 340 deletions(-) (limited to 'indra/newview/llavatarlist.cpp') diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index c0990d9d11..e467f74f9c 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llavatarlist.h * @brief Generic avatar list * * $LicenseInfo:firstyear=2009&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$ */ @@ -45,7 +45,7 @@ #include "llrecentpeople.h" #include "lluuid.h" #include "llvoiceclient.h" -#include "llviewercontrol.h" // for gSavedSettings +#include "llviewercontrol.h" // for gSavedSettings #include "lltooldraganddrop.h" static LLDefaultChildRegistry::Register r("avatar_list"); @@ -59,51 +59,51 @@ static const unsigned ADD_LIMIT = 50; bool LLAvatarList::contains(const LLUUID& id) { - const uuid_vec_t& ids = getIDs(); - return std::find(ids.begin(), ids.end(), id) != ids.end(); + const uuid_vec_t& ids = getIDs(); + return std::find(ids.begin(), ids.end(), id) != ids.end(); } void LLAvatarList::toggleIcons() { - // Save the new value for new items to use. - mShowIcons = !mShowIcons; - gSavedSettings.setBOOL(mIconParamName, mShowIcons); - - // Show/hide icons for all existing items. - std::vector items; - getItems(items); - for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) - { - static_cast(*it)->setAvatarIconVisible(mShowIcons); - } + // Save the new value for new items to use. + mShowIcons = !mShowIcons; + gSavedSettings.setBOOL(mIconParamName, mShowIcons); + + // Show/hide icons for all existing items. + std::vector items; + getItems(items); + for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) + { + static_cast(*it)->setAvatarIconVisible(mShowIcons); + } } void LLAvatarList::setSpeakingIndicatorsVisible(bool visible) { - // Save the new value for new items to use. - mShowSpeakingIndicator = visible; - - // Show/hide icons for all existing items. - std::vector items; - getItems(items); - for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) - { - static_cast(*it)->showSpeakingIndicator(mShowSpeakingIndicator); - } + // Save the new value for new items to use. + mShowSpeakingIndicator = visible; + + // Show/hide icons for all existing items. + std::vector items; + getItems(items); + for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) + { + static_cast(*it)->showSpeakingIndicator(mShowSpeakingIndicator); + } } void LLAvatarList::showPermissions(bool visible) { - // Save the value for new items to use. - mShowPermissions = visible; + // Save the value for new items to use. + mShowPermissions = visible; - // Enable or disable showing permissions icons for all existing items. - std::vector items; - getItems(items); - for(std::vector::const_iterator it = items.begin(), end_it = items.end(); it != end_it; ++it) - { - static_cast(*it)->setShowPermissions(mShowPermissions); - } + // Enable or disable showing permissions icons for all existing items. + std::vector items; + getItems(items); + for(std::vector::const_iterator it = items.begin(), end_it = items.end(); it != end_it; ++it) + { + static_cast(*it)->setShowPermissions(mShowPermissions); + } } static bool findInsensitive(std::string haystack, const std::string& needle_upper) @@ -128,7 +128,7 @@ LLAvatarList::Params::Params() } LLAvatarList::LLAvatarList(const Params& p) -: LLFlatListViewEx(p) +: LLFlatListViewEx(p) , mIgnoreOnlineStatus(p.ignore_online_status) , mShowLastInteractionTime(p.show_last_interaction_time) , mContextMenu(NULL) @@ -142,103 +142,103 @@ LLAvatarList::LLAvatarList(const Params& p) , mShowPermissions(p.show_permissions_granted) , mShowCompleteName(false) { - setCommitOnSelectionChange(true); + setCommitOnSelectionChange(true); - // Set default sort order. - setComparator(&NAME_COMPARATOR); + // Set default sort order. + setComparator(&NAME_COMPARATOR); - if (mShowLastInteractionTime) - { - mLITUpdateTimer = new LLTimer(); - mLITUpdateTimer->setTimerExpirySec(0); // zero to force initial update - mLITUpdateTimer->start(); - } - - LLAvatarNameCache::getInstance()->addUseDisplayNamesCallback(boost::bind(&LLAvatarList::handleDisplayNamesOptionChanged, this)); + if (mShowLastInteractionTime) + { + mLITUpdateTimer = new LLTimer(); + mLITUpdateTimer->setTimerExpirySec(0); // zero to force initial update + mLITUpdateTimer->start(); + } + + LLAvatarNameCache::getInstance()->addUseDisplayNamesCallback(boost::bind(&LLAvatarList::handleDisplayNamesOptionChanged, this)); } void LLAvatarList::handleDisplayNamesOptionChanged() { - mNeedUpdateNames = true; + mNeedUpdateNames = true; } LLAvatarList::~LLAvatarList() { - delete mLITUpdateTimer; + delete mLITUpdateTimer; } void LLAvatarList::setShowIcons(std::string param_name) { - mIconParamName= param_name; - mShowIcons = gSavedSettings.getBOOL(mIconParamName); + mIconParamName= param_name; + mShowIcons = gSavedSettings.getBOOL(mIconParamName); } std::string LLAvatarList::getAvatarName(LLAvatarName av_name) { - return mShowCompleteName? av_name.getCompleteName(false) : av_name.getDisplayName(); + return mShowCompleteName? av_name.getCompleteName(false) : av_name.getDisplayName(); } // virtual void LLAvatarList::draw() { - // *NOTE dzaporozhan - // Call refresh() after draw() to avoid flickering of avatar list items. + // *NOTE dzaporozhan + // Call refresh() after draw() to avoid flickering of avatar list items. - LLFlatListViewEx::draw(); + LLFlatListViewEx::draw(); - if (mNeedUpdateNames) - { - updateAvatarNames(); - } + if (mNeedUpdateNames) + { + updateAvatarNames(); + } - if (mDirty) - refresh(); + if (mDirty) + refresh(); - if (mShowLastInteractionTime && mLITUpdateTimer->hasExpired()) - { - updateLastInteractionTimes(); - mLITUpdateTimer->setTimerExpirySec(LIT_UPDATE_PERIOD); // restart the timer - } + if (mShowLastInteractionTime && mLITUpdateTimer->hasExpired()) + { + updateLastInteractionTimes(); + mLITUpdateTimer->setTimerExpirySec(LIT_UPDATE_PERIOD); // restart the timer + } } //virtual void LLAvatarList::clear() { - getIDs().clear(); - setDirty(true); - LLFlatListViewEx::clear(); + getIDs().clear(); + setDirty(true); + LLFlatListViewEx::clear(); } void LLAvatarList::setNameFilter(const std::string& filter) { - std::string filter_upper = filter; - LLStringUtil::toUpper(filter_upper); - if (mNameFilter != filter_upper) - { - mNameFilter = filter_upper; + std::string filter_upper = filter; + LLStringUtil::toUpper(filter_upper); + if (mNameFilter != filter_upper) + { + mNameFilter = filter_upper; - // update message for empty state here instead of refresh() to avoid blinking when switch - // between tabs. - updateNoItemsMessage(filter); - setDirty(); - } + // update message for empty state here instead of refresh() to avoid blinking when switch + // between tabs. + updateNoItemsMessage(filter); + setDirty(); + } } void LLAvatarList::sortByName() { - setComparator(&NAME_COMPARATOR); - sort(); + setComparator(&NAME_COMPARATOR); + sort(); } void LLAvatarList::setDirty(bool val /*= true*/, bool force_refresh /*= false*/) { - mDirty = val; - if(mDirty && force_refresh) - { - refresh(); - } + mDirty = val; + if(mDirty && force_refresh) + { + refresh(); + } } ////////////////////////////////////////////////////////////////////////// @@ -246,345 +246,345 @@ void LLAvatarList::setDirty(bool val /*= true*/, bool force_refresh /*= false*/) ////////////////////////////////////////////////////////////////////////// void LLAvatarList::refresh() { - bool have_names = TRUE; - bool add_limit_exceeded = false; - bool modified = false; - bool have_filter = !mNameFilter.empty(); - - // Save selection. - uuid_vec_t selected_ids; - getSelectedUUIDs(selected_ids); - LLUUID current_id = getSelectedUUID(); - - // Determine what to add and what to remove. - uuid_vec_t added, removed; - LLAvatarList::computeDifference(getIDs(), added, removed); - - // Handle added items. - unsigned nadded = 0; - const std::string waiting_str = LLTrans::getString("AvatarNameWaiting"); - - for (uuid_vec_t::const_iterator it=added.begin(); it != added.end(); it++) - { - const LLUUID& buddy_id = *it; - LLAvatarName av_name; - have_names &= LLAvatarNameCache::get(buddy_id, &av_name); - - if (!have_filter || findInsensitive(getAvatarName(av_name), mNameFilter)) - { - if (nadded >= ADD_LIMIT) - { - add_limit_exceeded = true; - break; - } - else - { - // *NOTE: If you change the UI to show a different string, - // be sure to change the filter code below. - std::string display_name = getAvatarName(av_name); - addNewItem(buddy_id, - display_name.empty() ? waiting_str : display_name, - LLAvatarTracker::instance().isBuddyOnline(buddy_id)); - - modified = true; - nadded++; - } - } - } - - // Handle removed items. - for (uuid_vec_t::const_iterator it=removed.begin(); it != removed.end(); it++) - { - removeItemByUUID(*it); - modified = true; - } - - // Handle filter. - if (have_filter) - { - std::vector cur_values; - getValues(cur_values); - - for (std::vector::const_iterator it=cur_values.begin(); it != cur_values.end(); it++) - { - const LLUUID& buddy_id = it->asUUID(); - LLAvatarName av_name; - have_names &= LLAvatarNameCache::get(buddy_id, &av_name); - if (!findInsensitive(getAvatarName(av_name), mNameFilter)) - { - removeItemByUUID(buddy_id); - modified = true; - } - } - } - - // Changed item in place, need to request sort and update columns - // because we might have changed data in a column on which the user - // has already sorted. JC - sort(); - - // re-select items - // selectMultiple(selected_ids); // TODO: implement in LLFlatListView if need - selectItemByUUID(current_id); - - // If the name filter is specified and the names are incomplete, - // we need to re-update when the names are complete so that - // the filter can be applied correctly. - // - // Otherwise, if we have no filter then no need to update again - // because the items will update their names. - bool dirty = add_limit_exceeded || (have_filter && !have_names); - setDirty(dirty); - - // Refreshed all items. - if(!dirty) - { - // Highlight items matching the filter. - std::vector items; - getItems(items); - for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) - { - static_cast(*it)->setHighlight(mNameFilter); - } - - // Send refresh_complete signal. - mRefreshCompleteSignal(this, LLSD((S32)size(false))); - } - - // Commit if we've added/removed items. - if (modified) - onCommit(); + bool have_names = TRUE; + bool add_limit_exceeded = false; + bool modified = false; + bool have_filter = !mNameFilter.empty(); + + // Save selection. + uuid_vec_t selected_ids; + getSelectedUUIDs(selected_ids); + LLUUID current_id = getSelectedUUID(); + + // Determine what to add and what to remove. + uuid_vec_t added, removed; + LLAvatarList::computeDifference(getIDs(), added, removed); + + // Handle added items. + unsigned nadded = 0; + const std::string waiting_str = LLTrans::getString("AvatarNameWaiting"); + + for (uuid_vec_t::const_iterator it=added.begin(); it != added.end(); it++) + { + const LLUUID& buddy_id = *it; + LLAvatarName av_name; + have_names &= LLAvatarNameCache::get(buddy_id, &av_name); + + if (!have_filter || findInsensitive(getAvatarName(av_name), mNameFilter)) + { + if (nadded >= ADD_LIMIT) + { + add_limit_exceeded = true; + break; + } + else + { + // *NOTE: If you change the UI to show a different string, + // be sure to change the filter code below. + std::string display_name = getAvatarName(av_name); + addNewItem(buddy_id, + display_name.empty() ? waiting_str : display_name, + LLAvatarTracker::instance().isBuddyOnline(buddy_id)); + + modified = true; + nadded++; + } + } + } + + // Handle removed items. + for (uuid_vec_t::const_iterator it=removed.begin(); it != removed.end(); it++) + { + removeItemByUUID(*it); + modified = true; + } + + // Handle filter. + if (have_filter) + { + std::vector cur_values; + getValues(cur_values); + + for (std::vector::const_iterator it=cur_values.begin(); it != cur_values.end(); it++) + { + const LLUUID& buddy_id = it->asUUID(); + LLAvatarName av_name; + have_names &= LLAvatarNameCache::get(buddy_id, &av_name); + if (!findInsensitive(getAvatarName(av_name), mNameFilter)) + { + removeItemByUUID(buddy_id); + modified = true; + } + } + } + + // Changed item in place, need to request sort and update columns + // because we might have changed data in a column on which the user + // has already sorted. JC + sort(); + + // re-select items + // selectMultiple(selected_ids); // TODO: implement in LLFlatListView if need + selectItemByUUID(current_id); + + // If the name filter is specified and the names are incomplete, + // we need to re-update when the names are complete so that + // the filter can be applied correctly. + // + // Otherwise, if we have no filter then no need to update again + // because the items will update their names. + bool dirty = add_limit_exceeded || (have_filter && !have_names); + setDirty(dirty); + + // Refreshed all items. + if(!dirty) + { + // Highlight items matching the filter. + std::vector items; + getItems(items); + for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) + { + static_cast(*it)->setHighlight(mNameFilter); + } + + // Send refresh_complete signal. + mRefreshCompleteSignal(this, LLSD((S32)size(false))); + } + + // Commit if we've added/removed items. + if (modified) + onCommit(); } void LLAvatarList::updateAvatarNames() { - std::vector items; - getItems(items); + std::vector items; + getItems(items); - for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) - { - LLAvatarListItem* item = static_cast(*it); - item->setShowCompleteName(mShowCompleteName); - item->updateAvatarName(); - } - mNeedUpdateNames = false; + for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) + { + LLAvatarListItem* item = static_cast(*it); + item->setShowCompleteName(mShowCompleteName); + item->updateAvatarName(); + } + mNeedUpdateNames = false; } bool LLAvatarList::filterHasMatches() { - uuid_vec_t values = getIDs(); + uuid_vec_t values = getIDs(); - for (uuid_vec_t::const_iterator it=values.begin(); it != values.end(); it++) - { - const LLUUID& buddy_id = *it; - LLAvatarName av_name; - bool have_name = LLAvatarNameCache::get(buddy_id, &av_name); + for (uuid_vec_t::const_iterator it=values.begin(); it != values.end(); it++) + { + const LLUUID& buddy_id = *it; + LLAvatarName av_name; + bool have_name = LLAvatarNameCache::get(buddy_id, &av_name); - // If name has not been loaded yet we consider it as a match. - // When the name will be loaded the filter will be applied again(in refresh()). + // If name has not been loaded yet we consider it as a match. + // When the name will be loaded the filter will be applied again(in refresh()). - if (have_name && !findInsensitive(getAvatarName(av_name), mNameFilter)) - { - continue; - } + if (have_name && !findInsensitive(getAvatarName(av_name), mNameFilter)) + { + continue; + } - return true; - } - return false; + return true; + } + return false; } boost::signals2::connection LLAvatarList::setRefreshCompleteCallback(const commit_signal_t::slot_type& cb) { - return mRefreshCompleteSignal.connect(cb); + return mRefreshCompleteSignal.connect(cb); } boost::signals2::connection LLAvatarList::setItemDoubleClickCallback(const mouse_signal_t::slot_type& cb) { - return mItemDoubleClickSignal.connect(cb); + return mItemDoubleClickSignal.connect(cb); } //virtual S32 LLAvatarList::notifyParent(const LLSD& info) { - if (info.has("sort") && &NAME_COMPARATOR == mItemComparator) - { - sort(); - return 1; - } - return LLFlatListViewEx::notifyParent(info); + if (info.has("sort") && &NAME_COMPARATOR == mItemComparator) + { + sort(); + return 1; + } + return LLFlatListViewEx::notifyParent(info); } void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos) { - LLAvatarListItem* item = new LLAvatarListItem(); - item->setShowCompleteName(mShowCompleteName); - // This sets the name as a side effect - item->setAvatarId(id, mSessionID, mIgnoreOnlineStatus); - item->setOnline(mIgnoreOnlineStatus ? true : is_online); - item->showLastInteractionTime(mShowLastInteractionTime); + LLAvatarListItem* item = new LLAvatarListItem(); + item->setShowCompleteName(mShowCompleteName); + // This sets the name as a side effect + item->setAvatarId(id, mSessionID, mIgnoreOnlineStatus); + item->setOnline(mIgnoreOnlineStatus ? true : is_online); + item->showLastInteractionTime(mShowLastInteractionTime); - item->setAvatarIconVisible(mShowIcons); - item->setShowInfoBtn(mShowInfoBtn); - item->setShowProfileBtn(mShowProfileBtn); - item->showSpeakingIndicator(mShowSpeakingIndicator); - item->setShowPermissions(mShowPermissions); + item->setAvatarIconVisible(mShowIcons); + item->setShowInfoBtn(mShowInfoBtn); + item->setShowProfileBtn(mShowProfileBtn); + item->showSpeakingIndicator(mShowSpeakingIndicator); + item->setShowPermissions(mShowPermissions); - item->setDoubleClickCallback(boost::bind(&LLAvatarList::onItemDoubleClicked, this, _1, _2, _3, _4)); + item->setDoubleClickCallback(boost::bind(&LLAvatarList::onItemDoubleClicked, this, _1, _2, _3, _4)); - addItem(item, id, pos); + addItem(item, id, pos); } // virtual BOOL LLAvatarList::handleRightMouseDown(S32 x, S32 y, MASK mask) { - BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); - if ( mContextMenu) - { - uuid_vec_t selected_uuids; - getSelectedUUIDs(selected_uuids); - mContextMenu->show(this, selected_uuids, x, y); - } - return handled; + BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); + if ( mContextMenu) + { + uuid_vec_t selected_uuids; + getSelectedUUIDs(selected_uuids); + mContextMenu->show(this, selected_uuids, x, y); + } + return handled; } BOOL LLAvatarList::handleMouseDown(S32 x, S32 y, MASK mask) { - gFocusMgr.setMouseCapture(this); + gFocusMgr.setMouseCapture(this); - S32 screen_x; - S32 screen_y; - localPointToScreen(x, y, &screen_x, &screen_y); - LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y); + S32 screen_x; + S32 screen_y; + localPointToScreen(x, y, &screen_x, &screen_y); + LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y); - return LLFlatListViewEx::handleMouseDown(x, y, mask); + return LLFlatListViewEx::handleMouseDown(x, y, mask); } BOOL LLAvatarList::handleMouseUp( S32 x, S32 y, MASK mask ) { - if(hasMouseCapture()) - { - gFocusMgr.setMouseCapture(NULL); - } + if(hasMouseCapture()) + { + gFocusMgr.setMouseCapture(NULL); + } - return LLFlatListViewEx::handleMouseUp(x, y, mask); + return LLFlatListViewEx::handleMouseUp(x, y, mask); } BOOL LLAvatarList::handleHover(S32 x, S32 y, MASK mask) { - bool handled = hasMouseCapture(); - if(handled) - { - S32 screen_x; - S32 screen_y; - localPointToScreen(x, y, &screen_x, &screen_y); - - if(LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y)) - { - // First, create the global drag and drop object - std::vector types; - uuid_vec_t cargo_ids; - getSelectedUUIDs(cargo_ids); - types.resize(cargo_ids.size(), DAD_PERSON); - LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_PEOPLE; - LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, src); - } - } - - if(!handled) - { - handled = LLFlatListViewEx::handleHover(x, y, mask); - } - - return handled; + bool handled = hasMouseCapture(); + if(handled) + { + S32 screen_x; + S32 screen_y; + localPointToScreen(x, y, &screen_x, &screen_y); + + if(LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y)) + { + // First, create the global drag and drop object + std::vector types; + uuid_vec_t cargo_ids; + getSelectedUUIDs(cargo_ids); + types.resize(cargo_ids.size(), DAD_PERSON); + LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_PEOPLE; + LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, src); + } + } + + if(!handled) + { + handled = LLFlatListViewEx::handleHover(x, y, mask); + } + + return handled; } void LLAvatarList::setVisible(BOOL visible) { - if ( visible == FALSE && mContextMenu ) - { - mContextMenu->hide(); - } - LLFlatListViewEx::setVisible(visible); + if ( visible == FALSE && mContextMenu ) + { + mContextMenu->hide(); + } + LLFlatListViewEx::setVisible(visible); } void LLAvatarList::computeDifference( - const uuid_vec_t& vnew_unsorted, - uuid_vec_t& vadded, - uuid_vec_t& vremoved) + const uuid_vec_t& vnew_unsorted, + uuid_vec_t& vadded, + uuid_vec_t& vremoved) { - uuid_vec_t vcur; + uuid_vec_t vcur; - // Convert LLSDs to LLUUIDs. - { - std::vector vcur_values; - getValues(vcur_values); + // Convert LLSDs to LLUUIDs. + { + std::vector vcur_values; + getValues(vcur_values); - for (size_t i=0; i items; - getItems(items); + S32 now = (S32) LLDate::now().secondsSinceEpoch(); + std::vector items; + getItems(items); - for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) - { - // *TODO: error handling - LLAvatarListItem* item = static_cast(*it); - S32 secs_since = now - (S32) LLRecentPeople::instance().getDate(item->getAvatarId()).secondsSinceEpoch(); - if (secs_since >= 0) - item->setLastInteractionTime(secs_since); - } + for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) + { + // *TODO: error handling + LLAvatarListItem* item = static_cast(*it); + S32 secs_since = now - (S32) LLRecentPeople::instance().getDate(item->getAvatarId()).secondsSinceEpoch(); + if (secs_since >= 0) + item->setLastInteractionTime(secs_since); + } } void LLAvatarList::onItemDoubleClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask) { - mItemDoubleClickSignal(ctrl, x, y, mask); + mItemDoubleClickSignal(ctrl, x, y, mask); } bool LLAvatarItemComparator::compare(const LLPanel* item1, const LLPanel* item2) const { - const LLAvatarListItem* avatar_item1 = dynamic_cast(item1); - const LLAvatarListItem* avatar_item2 = dynamic_cast(item2); - - if (!avatar_item1 || !avatar_item2) - { - LL_ERRS() << "item1 and item2 cannot be null" << LL_ENDL; - return true; - } + const LLAvatarListItem* avatar_item1 = dynamic_cast(item1); + const LLAvatarListItem* avatar_item2 = dynamic_cast(item2); + + if (!avatar_item1 || !avatar_item2) + { + LL_ERRS() << "item1 and item2 cannot be null" << LL_ENDL; + return true; + } - return doCompare(avatar_item1, avatar_item2); + return doCompare(avatar_item1, avatar_item2); } bool LLAvatarItemNameComparator::doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const { - std::string name1 = avatar_item1->getAvatarName(); - std::string name2 = avatar_item2->getAvatarName(); + std::string name1 = avatar_item1->getAvatarName(); + std::string name2 = avatar_item2->getAvatarName(); - LLStringUtil::toUpper(name1); - LLStringUtil::toUpper(name2); + LLStringUtil::toUpper(name1); + LLStringUtil::toUpper(name2); - return name1 < name2; + return name1 < name2; } bool LLAvatarItemAgentOnTopComparator::doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const { - //keep agent on top, if first is agent, - //then we need to return true to elevate this id, otherwise false. - if(avatar_item1->getAvatarId() == gAgentID) - { - return true; - } - else if (avatar_item2->getAvatarId() == gAgentID) - { - return false; - } - return LLAvatarItemNameComparator::doCompare(avatar_item1,avatar_item2); + //keep agent on top, if first is agent, + //then we need to return true to elevate this id, otherwise false. + if(avatar_item1->getAvatarId() == gAgentID) + { + return true; + } + else if (avatar_item2->getAvatarId() == gAgentID) + { + return false; + } + return LLAvatarItemNameComparator::doCompare(avatar_item1,avatar_item2); } -- cgit v1.2.3