summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-14 10:18:13 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-14 10:18:13 +0100
commit168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (patch)
tree47c634a7ed0d6b4ec8ed7711bbc4cf880f7daaba /indra/newview/lltoast.cpp
parentf480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (diff)
parent8dd62863092b10e012db20e818e72b53fd2ed84a (diff)
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/lltoast.cpp')
-rw-r--r--indra/newview/lltoast.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 60657d3fa7..911ed6ade7 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -285,6 +285,12 @@ void LLToast::setVisible(BOOL show)
}
LLModalDialog::setFrontmost(FALSE);
}
+ else
+ {
+ //hide "hide" button in case toast was hidden without mouse_leave
+ if(mHideBtn)
+ mHideBtn->setVisible(show);
+ }
LLFloater::setVisible(show);
if(mPanel)
{