summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDmitry Oleshko <doleshko@productengine.com>2009-12-08 18:55:36 +0200
committerDmitry Oleshko <doleshko@productengine.com>2009-12-08 18:55:36 +0200
commit09f0b98e14a167902ffea75467e8c528cab8dad8 (patch)
treed8948b0530c882100ada40ac9602857e76dfa7c5 /indra/newview
parent00212e98d6b568cb505a99a06fadc54595f242ac (diff)
additional fix for outgoing voice notification
now only "NO ANSWER" notification closed after specified timeout --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index b710c41650..9790bdf9c0 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1422,6 +1422,8 @@ void LLOutgoingCallDialog::onOpen(const LLSD& key)
LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
icon->setValue(callee_id);
+ // stop timer by default
+ mLifetimeTimer.stop();
if(mPayload.has("start_timer"))
{
mLifetimeTimer.reset();