summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-12-22 09:36:12 -0800
committerAndrew Meadows <andrew@lindenlab.com>2010-12-22 09:36:12 -0800
commit7365ee2d9d79813b6f515d333b63210d583038b5 (patch)
treebd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/newview/llimview.h
parent049b00a6f10d50609055810b0800f49476b351d2 (diff)
parentab100825bd0064dc64b9ef8bea1c70bc04090716 (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