summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertopobjects.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-10 22:39:11 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-10 22:39:11 -0800
commit0e07758b540374aa421d2938ce5ed13e2b9eefe4 (patch)
tree145600f9494489b686e13b53edc7f10d75afa0e3 /indra/newview/llfloatertopobjects.h
parent4bbe823302427a705ea541d968f6058571a13c2f (diff)
parent61fbc02deb08c1a69b8c24498fe559359496ac91 (diff)
merge with STORM-105 and viewer-development
Diffstat (limited to 'indra/newview/llfloatertopobjects.h')
-rw-r--r--indra/newview/llfloatertopobjects.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index a608ca20f1..edd91c491f 100644
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -29,8 +29,11 @@
#include "llfloater.h"
+class LLAvatarName;
class LLUICtrl;
+#include <boost/signals2.hpp> // boost::signals2::trackable
+
class LLFloaterTopObjects : public LLFloater
{
friend class LLFloaterReg;
@@ -51,6 +54,8 @@ public:
static void setMode(U32 mode);
+ void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name, LLSD element);
+
private:
LLFloaterTopObjects(const LLSD& key);
~LLFloaterTopObjects();