summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-12-09 16:19:03 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-12-09 16:19:03 -0800
commitcc92db1f353de96f6d27863b92671b2d847536f4 (patch)
tree75dccadc2f25115712cd48040bb11c5c424ee196 /indra/llui
parent8878a5e561f292a8afcd933eaafb2c4c65b7bf7f (diff)
Moved outbox import confirmations to window shades on the merchant outbox floater, rather than modal dialogs.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llwindowshade.cpp5
-rw-r--r--indra/llui/llwindowshade.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llwindowshade.cpp b/indra/llui/llwindowshade.cpp
index cf76202215..b21c088a1f 100644
--- a/indra/llui/llwindowshade.cpp
+++ b/indra/llui/llwindowshade.cpp
@@ -297,6 +297,11 @@ void LLWindowShade::hide()
setMouseOpaque(false);
}
+bool LLWindowShade::isShown() const
+{
+ return getChildRef<LLLayoutPanel>("notification_area").getVisible();
+}
+
void LLWindowShade::onCloseNotification()
{
LLNotifications::instance().cancel(mNotification);
diff --git a/indra/llui/llwindowshade.h b/indra/llui/llwindowshade.h
index 09ffc2cd54..cb8f223a84 100644
--- a/indra/llui/llwindowshade.h
+++ b/indra/llui/llwindowshade.h
@@ -48,6 +48,8 @@ public:
void show();
/*virtual*/ void draw();
void hide();
+
+ bool isShown() const;
private:
friend class LLUICtrlFactory;