diff options
Diffstat (limited to 'indra/newview/llrecentpeople.h')
| -rw-r--r-- | indra/newview/llrecentpeople.h | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h index fce4b8d42b..852a92ff80 100644 --- a/indra/newview/llrecentpeople.h +++ b/indra/newview/llrecentpeople.h @@ -2,31 +2,25 @@ * @file llrecentpeople.h * @brief List of people with which the user has recently interacted. * - * $LicenseInfo:firstyear=2009&license=viewergpl$ - * - * Copyright (c) 2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * 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 + * 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. * - * 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 + * 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. * - * 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. + * 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 * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -39,7 +33,9 @@ #include <vector> #include <set> -#include <boost/signal.hpp> +#include <boost/signals2.hpp> + +class LLDate; /** * List of people the agent recently interacted with. @@ -56,13 +52,13 @@ class LLRecentPeople: public LLSingleton<LLRecentPeople>, public LLOldEvents::LL { LOG_CLASS(LLRecentPeople); public: - typedef boost::signal<void ()> signal_t; + typedef boost::signals2::signal<void ()> signal_t; /** * Add specified avatar to the list if it's not there already. * * @param id avatar to add. - * @return false if the avatar is in the list already, true otherwisr + * @return false if the avatar is in the list already, true otherwise */ bool add(const LLUUID& id); @@ -77,14 +73,16 @@ public: * * @param result where to put the result. */ - void get(std::vector<LLUUID>& result) const; + void get(uuid_vec_t& result) const; + + const LLDate& getDate(const LLUUID& id) const; /** * Set callback to be called when the list changed. * * Multiple callbacks can be set. * - * @return no connection; use boost::bind + boost::signal::trackable to disconnect slots. + * @return no connection; use boost::bind + boost::signals2::trackable to disconnect slots. */ void setChangedCallback(const signal_t::slot_type& cb) { mChangedSignal.connect(cb); } @@ -94,7 +92,8 @@ public: /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); private: - std::set<LLUUID> mList; + typedef std::map<LLUUID, LLDate> recent_people_t; + recent_people_t mPeople; signal_t mChangedSignal; }; |