diff options
Diffstat (limited to 'indra/newview/llchiclet.h')
| -rw-r--r-- | indra/newview/llchiclet.h | 96 |
1 files changed, 39 insertions, 57 deletions
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h index a6e12006a1..97f494b817 100644 --- a/indra/newview/llchiclet.h +++ b/indra/newview/llchiclet.h @@ -2,25 +2,31 @@ * @file llchiclet.h * @brief LLChiclet class header file * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. + * $LicenseInfo:firstyear=2002&license=viewergpl$ + * + * Copyright (c) 2002-2009, 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. + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * - * 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. + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception * - * 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 + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ */ @@ -422,31 +428,12 @@ public: virtual void setToggleState(bool toggle); - /** - * Displays popup menu. - */ - virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); - protected: LLIMChiclet(const LLIMChiclet::Params& p); protected: - /** - * Creates chiclet popup menu. - */ - virtual void createPopupMenu() = 0; - - /** - * Enables/disables menus. - */ - virtual void updateMenuItems() {}; - - bool canCreateMenu(); - - LLMenuGL* mPopupMenu; - bool mShowSpeaker; bool mCounterEnabled; /* initial width of chiclet, should not include counter or speaker width */ @@ -532,6 +519,11 @@ protected: */ virtual void onMenuItemClicked(const LLSD& user_data); + /** + * Displays popup menu. + */ + /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + /** * Enables/disables menus based on relationship with other participant. * Enables/disables "show session" menu item depending on visible IM floater existence. @@ -541,6 +533,7 @@ protected: private: LLChicletAvatarIconCtrl* mChicletIconCtrl; + LLMenuGL* mPopupMenu; }; /** @@ -605,6 +598,11 @@ protected: virtual void onMenuItemClicked(const LLSD& user_data); /** + * Displays popup menu. + */ + virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + + /** * Finds a current speaker and resets the SpeakerControl with speaker's ID */ /*virtual*/ void switchToCurrentSpeaker(); @@ -612,6 +610,7 @@ protected: private: LLChicletAvatarIconCtrl* mChicletIconCtrl; + LLMenuGL* mPopupMenu; }; /** @@ -648,16 +647,6 @@ protected: LLScriptChiclet(const Params&); friend class LLUICtrlFactory; - /** - * Creates chiclet popup menu. - */ - virtual void createPopupMenu(); - - /** - * Processes clicks on chiclet popup menu. - */ - virtual void onMenuItemClicked(const LLSD& user_data); - private: LLIconCtrl* mChicletIconCtrl; @@ -696,16 +685,6 @@ protected: LLInvOfferChiclet(const Params&); friend class LLUICtrlFactory; - /** - * Creates chiclet popup menu. - */ - virtual void createPopupMenu(); - - /** - * Processes clicks on chiclet popup menu. - */ - virtual void onMenuItemClicked(const LLSD& user_data); - private: LLChicletInvOfferIconCtrl* mChicletIconCtrl; }; @@ -788,9 +767,15 @@ protected: */ virtual void updateMenuItems(); + /** + * Displays popup menu. + */ + /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + private: LLChicletGroupIconCtrl* mChicletIconCtrl; + LLMenuGL* mPopupMenu; }; /** @@ -915,9 +900,6 @@ protected: class LLNotificationChiclet : public LLSysWellChiclet { friend class LLUICtrlFactory; -public: - struct Params : public LLInitParam::Block<Params, LLSysWellChiclet::Params>{}; - protected: LLNotificationChiclet(const Params& p); |