diff options
Diffstat (limited to 'indra/newview/llgroupiconctrl.cpp')
| -rw-r--r-- | indra/newview/llgroupiconctrl.cpp | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp index 7c2a3cad43..af2b3c10c5 100644 --- a/indra/newview/llgroupiconctrl.cpp +++ b/indra/newview/llgroupiconctrl.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llgroupiconctrl.cpp * @brief LLGroupIconCtrl class implementation * * $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$ */ @@ -34,9 +34,9 @@ static LLDefaultChildRegistry::Register<LLGroupIconCtrl> g_i("group_icon"); LLGroupIconCtrl::Params::Params() -: group_id("group_id"), - draw_tooltip("draw_tooltip", true), - default_icon_name("default_icon_name") +: group_id("group_id"), + draw_tooltip("draw_tooltip", true), + default_icon_name("default_icon_name") { changeDefault(min_width, 32); changeDefault(min_height, 32); @@ -44,12 +44,12 @@ LLGroupIconCtrl::Params::Params() LLGroupIconCtrl::LLGroupIconCtrl(const LLGroupIconCtrl::Params& p) -: LLIconCtrl(p), - mGroupId(LLUUID::null), - mDrawTooltip(p.draw_tooltip), - mDefaultIconName(p.default_icon_name) +: LLIconCtrl(p), + mGroupId(LLUUID::null), + mDrawTooltip(p.draw_tooltip), + mDefaultIconName(p.default_icon_name) { - mPriority = LLViewerFetchedTexture::BOOST_ICON; + mPriority = LLViewerFetchedTexture::BOOST_ICON; // don't request larger image then necessary to save gl memory, // but ensure that quality is sufficient @@ -57,21 +57,21 @@ LLGroupIconCtrl::LLGroupIconCtrl(const LLGroupIconCtrl::Params& p) mMaxHeight = llmax((S32)p.min_height, rect.getHeight()); mMaxWidth = llmax((S32)p.min_width, rect.getWidth()); - if (p.group_id.isProvided()) - { - LLSD value(p.group_id); - setValue(value); - } - else - { - //TODO: Consider implementing dedicated setDefault() function instead of passing priority for local file - LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI); - } + if (p.group_id.isProvided()) + { + LLSD value(p.group_id); + setValue(value); + } + else + { + //TODO: Consider implementing dedicated setDefault() function instead of passing priority for local file + LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI); + } } LLGroupIconCtrl::~LLGroupIconCtrl() { - LLGroupMgr::getInstance()->removeObserver(this); + LLGroupMgr::getInstance()->removeObserver(this); } void LLGroupIconCtrl::setIconId(const LLUUID& icon_id) @@ -88,57 +88,57 @@ void LLGroupIconCtrl::setIconId(const LLUUID& icon_id) void LLGroupIconCtrl::setValue(const LLSD& value) { - if (value.isUUID()) - { - LLGroupMgr* gm = LLGroupMgr::getInstance(); - if (mGroupId.notNull()) - { - gm->removeObserver(this); - } - - if (mGroupId != value.asUUID()) - { - mGroupId = value.asUUID(); - mID = mGroupId; // set LLGroupMgrObserver::mID to make callbacks work - - // Check if cache already contains image_id for that group - if (!updateFromCache()) - { - LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI); - gm->addObserver(this); - gm->sendGroupPropertiesRequest(mGroupId); - } - } - } - else - { - LLIconCtrl::setValue(value); - } + if (value.isUUID()) + { + LLGroupMgr* gm = LLGroupMgr::getInstance(); + if (mGroupId.notNull()) + { + gm->removeObserver(this); + } + + if (mGroupId != value.asUUID()) + { + mGroupId = value.asUUID(); + mID = mGroupId; // set LLGroupMgrObserver::mID to make callbacks work + + // Check if cache already contains image_id for that group + if (!updateFromCache()) + { + LLIconCtrl::setValue(mDefaultIconName, LLViewerFetchedTexture::BOOST_UI); + gm->addObserver(this); + gm->sendGroupPropertiesRequest(mGroupId); + } + } + } + else + { + LLIconCtrl::setValue(value); + } } void LLGroupIconCtrl::changed(LLGroupChange gc) { - if (GC_PROPERTIES == gc) - { - updateFromCache(); - } + if (GC_PROPERTIES == gc) + { + updateFromCache(); + } } bool LLGroupIconCtrl::updateFromCache() { - LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mGroupId); - if (!group_data) return false; - - setIconId(group_data->mInsigniaID); - - if (mDrawTooltip && !group_data->mName.empty()) - { - setToolTip(group_data->mName); - } - else - { - setToolTip(LLStringUtil::null); - } - return true; + LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mGroupId); + if (!group_data) return false; + + setIconId(group_data->mInsigniaID); + + if (mDrawTooltip && !group_data->mName.empty()) + { + setToolTip(group_data->mName); + } + else + { + setToolTip(LLStringUtil::null); + } + return true; } |