diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-30 09:42:04 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-30 09:42:04 -0700 |
| commit | 6324cf82f290e88c3db677e1ced706560d5ca00b (patch) | |
| tree | bb6a8ba8b71a8ee15ab4423b157d18f11ae5b3c5 /indra/llui/llfloater.h | |
| parent | 478f3d075b778740abe12f92c00ad6527545ee6c (diff) | |
| parent | b2526cde2393ca7d84284b254fb4f37b9e8abb5b (diff) | |
Merge hg.aws.productengine.com/secondlife/viewer-2-0/ revs 3836-3849
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index afdc4ccf00..ef0d06a58e 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -124,6 +124,7 @@ public: can_tear_off, save_rect, save_visibility, + save_dock_state, can_dock; Optional<S32> header_height, legacy_header_height; // HACK see initFromXML() @@ -280,8 +281,10 @@ protected: void setRectControl(const std::string& rectname) { mRectControl = rectname; }; void applyRectControl(); + void applyDockState(); void storeRectControl(); void storeVisibilityControl(); + void storeDockStateControl(); void setKey(const LLSD& key); void setInstanceName(const std::string& name); @@ -322,6 +325,7 @@ public: protected: std::string mRectControl; std::string mVisibilityControl; + std::string mDocStateControl; LLSD mKey; // Key used for retrieving instances; set (for now) by LLFLoaterReg LLDragHandle* mDragHandle; |