diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 10:12:54 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 10:12:54 -0800 |
commit | 6ff6ed4d1148a66b188472c94b58bd573389942d (patch) | |
tree | a4a6e2a4711c3d9a3dd019e98507a568cac4ba60 /indra/newview/llimview.cpp | |
parent | f11f8b34478f0d408689fe7959f233567001374d (diff) | |
parent | 254b7d72d17c279aa906ee235f08ff1fa9e2b9cf (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index c2a7969c0d..32b0cbff38 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1680,6 +1680,7 @@ void LLOutgoingCallDialog::show(const LLSD& key) case LLVoiceChannel::STATE_ERROR : getChild<LLTextBox>("noanswer")->setVisible(true); getChild<LLButton>("Cancel")->setVisible(false); + setCanClose(true); mLifetimeTimer.start(); break; case LLVoiceChannel::STATE_HUNG_UP : @@ -1692,6 +1693,7 @@ void LLOutgoingCallDialog::show(const LLSD& key) getChild<LLTextBox>("nearby")->setVisible(true); } getChild<LLButton>("Cancel")->setVisible(false); + setCanClose(true); mLifetimeTimer.start(); } |