diff options
author | Armin Weatherwax | 2011-01-24 18:46:25 +0100 |
---|---|---|
committer | Armin Weatherwax | 2011-01-24 20:20:36 +0100 |
commit | cf573d4143491abe627b69dd7e6b0e0349109913 (patch) | |
tree | ea5ad4d7988bfbc7b6a7b7eb4f125f57f2bc7094 /linden/indra/newview/llimpanel.h | |
parent | re-enable statistics packet for SL, firstuse warn about it (diff) | |
download | meta-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/llimpanel.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h index ddcbdc7..b5a0165 100644 --- a/linden/indra/newview/llimpanel.h +++ b/linden/indra/newview/llimpanel.h | |||
@@ -33,6 +33,7 @@ | |||
33 | #ifndef LL_IMPANEL_H | 33 | #ifndef LL_IMPANEL_H |
34 | #define LL_IMPANEL_H | 34 | #define LL_IMPANEL_H |
35 | 35 | ||
36 | #include "llavatarnamecache.h" | ||
36 | #include "llfloater.h" | 37 | #include "llfloater.h" |
37 | #include "lllogchat.h" | 38 | #include "lllogchat.h" |
38 | #include "lluuid.h" | 39 | #include "lluuid.h" |
@@ -194,6 +195,9 @@ public: | |||
194 | EInstantMessage dialog); | 195 | EInstantMessage dialog); |
195 | virtual ~LLFloaterIMPanel(); | 196 | virtual ~LLFloaterIMPanel(); |
196 | 197 | ||
198 | void lookupName(); | ||
199 | static void onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data); | ||
200 | |||
197 | /*virtual*/ BOOL postBuild(); | 201 | /*virtual*/ BOOL postBuild(); |
198 | 202 | ||
199 | // Check typing timeout timer. | 203 | // Check typing timeout timer. |
@@ -365,6 +369,8 @@ private: | |||
365 | typedef std::map<LLUUID, LLStyleSP> styleMap; | 369 | typedef std::map<LLUUID, LLStyleSP> styleMap; |
366 | static styleMap mStyleMap; | 370 | static styleMap mStyleMap; |
367 | 371 | ||
372 | static std::set<LLFloaterIMPanel*> sFloaterIMPanels; | ||
373 | |||
368 | typedef enum e_im_format | 374 | typedef enum e_im_format |
369 | { | 375 | { |
370 | IM_PANEL_PLAIN, | 376 | IM_PANEL_PLAIN, |