summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-17 16:33:16 -0700
committerJames Cook <james@lindenlab.com>2010-05-17 16:33:16 -0700
commit118ab8900a7ddc86564a84d836f507d4a1aa86b7 (patch)
tree1b881e52a54772bbd67bb51c1549293cb3935eff /indra/newview/llimview.h
parent40adb9599cd7eac1fd8062e4629a0e8b8c031638 (diff)
DEV-50013 Display name for inbound voice calls
(Last commit was actually for outbound). Reviewed with Leyla
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r--indra/newview/llimview.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 758ea667ef..c132ac328f 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -41,7 +41,7 @@
#include "llvoicechannel.h"
-
+class LLAvatarName;
class LLFriendObserver;
class LLCallDialogManager;
class LLIMSpeakerMgr;
@@ -540,6 +540,13 @@ public:
static void onStartIM(void* user_data);
private:
+ void setCallerName(const std::string& ui_title,
+ const std::string& ui_label,
+ const std::string& call_type);
+ void onAvatarNameCache(const LLUUID& agent_id,
+ const LLAvatarName& av_name,
+ const std::string& call_type);
+
/*virtual*/ void onLifetimeExpired();
void processCallResponse(S32 response);
};