diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-30 16:06:16 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-30 16:06:16 +0200 |
| commit | 2e8e7b93362555f00f124eb005491133554cc2e5 (patch) | |
| tree | 046cf221da47bbbee30e6c32ea0c38168680681e /indra | |
| parent | 3a50996058b3892fccb0196db23f8c36d5573b70 (diff) | |
| parent | 8b93a0d83d15416a381261d7a47b535b36f40ff5 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a7ce027416..40227539d0 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1748,7 +1748,8 @@ BOOL LLIncomingCallDialog::postBuild() childSetAction("Start IM", onStartIM, this); childSetFocus("Accept"); - if(mPayload["notify_box_type"] != "VoiceInviteGroup" && mPayload["notify_box_type"] != "VoiceInviteAdHoc") + std::string notify_box_type = mPayload["notify_box_type"].asString(); + if(notify_box_type != "VoiceInviteGroup" && notify_box_type != "VoiceInviteAdHoc") { // starting notification's timer for P2P and AVALINE invitations mLifetimeTimer.start(); |