diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 14:47:29 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 14:47:29 +0000 |
| commit | f210d79443dfd72226677c1574c01846d1bedd04 (patch) | |
| tree | f9087392baa1e07203458362344aa106a9b9acba /indra/newview/llimview.cpp | |
| parent | 1b8a7fdeaab78216baad1f916e9788c0b90287b3 (diff) | |
| parent | ce46b83538eacd769c78befa31d8f824509342cd (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 0965cbd0dc..5a6c6ebbee 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1665,6 +1665,7 @@ void LLOutgoingCallDialog::show(const LLSD& key) { case LLVoiceChannel::STATE_CALL_STARTED : getChild<LLTextBox>("calling")->setVisible(true); + getChild<LLButton>("Cancel")->setVisible(true); if(show_oldchannel) { getChild<LLTextBox>("leaving")->setVisible(true); |