summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-13 17:51:14 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-13 17:51:14 -0500
commit27f11d9868bc72e7096ae6266af1c6c9318c545e (patch)
tree12190521b6870891072e312c8b3e8864721aa075 /indra/newview/llimview.h
parentfbab245e487650d6420c9fe33cf07123af12f422 (diff)
parentdd06d42c09e5e1f4b28559059ec8393e53f767a7 (diff)
merge
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r--indra/newview/llimview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 3f72d66bfb..e765a8da2f 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -542,6 +542,7 @@ public:
static void onReject(void* user_data);
static void onStartIM(void* user_data);
+ static void processCallResponse(S32 response, const LLSD& payload);
private:
void setCallerName(const std::string& ui_title,
const std::string& ui_label,
@@ -551,7 +552,6 @@ private:
const std::string& call_type);
/*virtual*/ void onLifetimeExpired();
- void processCallResponse(S32 response);
};
class LLOutgoingCallDialog : public LLCallDialog