summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.h
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-12 16:51:10 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-12 16:51:10 -0700
commit17731c50a8ad2c465654db3cf88bcc2e885e2716 (patch)
treeb622c68a5dce0b8541010b41ebabd564342a6624 /indra/llui/llfloater.h
parent45a316831636043663972bdf83adbefb345549de (diff)
parentd5d7e264ad636a42470772f5e96914327e30eca2 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r--indra/llui/llfloater.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index c94aa0207e..5e3d3aefc9 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -213,7 +213,9 @@ public:
void addDependentFloater(LLHandle<LLFloater> dependent_handle, BOOL reposition = TRUE);
LLFloater* getDependee() { return (LLFloater*)mDependeeHandle.get(); }
void removeDependentFloater(LLFloater* dependent);
- BOOL isMinimized() const { return mMinimized; }
+ BOOL isMinimized() const { return mMinimized; }
+ void setVisibleWhenMinimized(bool visible);
+ bool getVisibleWhenMinimized() const { return mVisibleWhenMinimized;}
/// isShown() differs from getVisible() in that isShown() also considers
/// isMinimized(). isShown() is true only if visible and not minimized.
bool isShown() const;