aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateractivespeakers.h
diff options
context:
space:
mode:
authorArmin Weatherwax2011-01-24 18:46:25 +0100
committerArmin Weatherwax2011-01-24 20:20:36 +0100
commitcf573d4143491abe627b69dd7e6b0e0349109913 (patch)
treeea5ad4d7988bfbc7b6a7b7eb4f125f57f2bc7094 /linden/indra/newview/llfloateractivespeakers.h
parentre-enable statistics packet for SL, firstuse warn about it (diff)
downloadmeta-impy-cf573d4143491abe627b69dd7e6b0e0349109913.zip
meta-impy-cf573d4143491abe627b69dd7e6b0e0349109913.tar.gz
meta-impy-cf573d4143491abe627b69dd7e6b0e0349109913.tar.bz2
meta-impy-cf573d4143491abe627b69dd7e6b0e0349109913.tar.xz
Henri Beauchamp: Display Names support v4
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloateractivespeakers.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloateractivespeakers.h b/linden/indra/newview/llfloateractivespeakers.h
index b2c44e2..dc3dd73 100644
--- a/linden/indra/newview/llfloateractivespeakers.h
+++ b/linden/indra/newview/llfloateractivespeakers.h
@@ -33,6 +33,7 @@
33#ifndef LL_LLFLOATERACTIVESPEAKERS_H 33#ifndef LL_LLFLOATERACTIVESPEAKERS_H
34#define LL_LLFLOATERACTIVESPEAKERS_H 34#define LL_LLFLOATERACTIVESPEAKERS_H
35 35
36#include "llavatarnamecache.h"
36#include "llfloater.h" 37#include "llfloater.h"
37#include "llmemory.h" 38#include "llmemory.h"
38#include "llvoiceclient.h" 39#include "llvoiceclient.h"
@@ -73,7 +74,7 @@ public:
73 ~LLSpeaker() {}; 74 ~LLSpeaker() {};
74 void lookupName(); 75 void lookupName();
75 76
76 static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data); 77 static void onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data);
77 78
78 ESpeakerStatus mStatus; // current activity status in speech group 79 ESpeakerStatus mStatus; // current activity status in speech group
79 F32 mLastSpokeTime; // timestamp when this speaker last spoke 80 F32 mLastSpokeTime; // timestamp when this speaker last spoke