diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
commit | 1fa2afbe2007690612f360eff3603a353ee95672 (patch) | |
tree | bd5a48c23a2280afcd0115cc6dd1d70764162b1c /indra/llui/llfloater.h | |
parent | fe14e50a45a450cd7bcdfe73a8bbda03c018053f (diff) | |
parent | 4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff) |
merge
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r-- | indra/llui/llfloater.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 5b7b020881..58c2d34253 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -253,7 +253,7 @@ public: LLHandle<LLFloater> getHandle() const { return mHandle; } const LLSD& getKey() { return mKey; } - BOOL matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); } + virtual bool matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); } const std::string& getInstanceName() { return mInstanceName; } @@ -265,6 +265,8 @@ public: virtual void setTornOff(bool torn_off) { mTornOff = torn_off; } + void stackWith(LLFloater& other); + // Return a closeable floater, if any, given the current focus. static LLFloater* getClosableFloaterFromFocus(); @@ -289,9 +291,6 @@ public: void updateTransparency(ETypeTransparency transparency_type); protected: - - void setRectControl(const std::string& rectname) { mRectControl = rectname; }; - virtual void applySavedVariables(); void applyRectControl(); @@ -455,8 +454,6 @@ protected: public: /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); - void reshapeFloater(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical); - /*virtual*/ void draw(); /*virtual*/ LLRect getSnapRect() const; /*virtual*/ void refresh(); |