diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
commit | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (patch) | |
tree | 7c016ab72795543361d206de5344b34a6a823fdf /indra/newview/llimfloater.h | |
parent | dac53830f1a67c8657ced9c39eccedbadf149bd9 (diff) | |
parent | 40979589afc5c91cab977307a1e400315b1c8a8f (diff) |
merge with STORM-105
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r-- | indra/newview/llimfloater.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index e604623b1b..e80e45e64a 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -32,6 +32,7 @@ #include "lltooldraganddrop.h" #include "lltransientdockablefloater.h" +class LLAvatarName; class LLLineEditor; class LLPanelChatControlPanel; class LLChatHistory; @@ -124,6 +125,12 @@ private: /* virtual */ void onFocusLost(); /* virtual */ void onFocusReceived(); + // Update the window title, input field help text, etc. + void updateSessionName(const std::string& ui_title, const std::string& ui_label); + + // For display name lookups for IM window titles + void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name); + BOOL dropCallingCard(LLInventoryItem* item, BOOL drop); BOOL dropCategory(LLInventoryCategory* category, BOOL drop); |