diff options
| author | Richard Linden <none@none> | 2011-11-28 23:15:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-28 23:15:03 -0800 |
| commit | acd047b6be30bd1537aa62616ed70b02af7405b3 (patch) | |
| tree | c4a505cb6349927f37e45ab66584886ad20e5170 /indra/llui/llfloater.h | |
| parent | a16bc265da9229bebc7ced7aeccdf56693b88a80 (diff) | |
| parent | 700277e00aa83506808f2128705143d7ae4937bd (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 8886ae3393..c70eb0958d 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -83,7 +83,7 @@ namespace LLInitParam } -class LLFloater : public LLPanel +class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater> { friend class LLFloaterView; friend class LLFloaterReg; @@ -283,7 +283,7 @@ public: void clearSnapTarget() { mSnappedTo.markDead(); } LLHandle<LLFloater> getSnapTarget() const { return mSnappedTo; } - LLHandle<LLFloater> getHandle() const { return mHandle; } + LLHandle<LLFloater> getHandle() const { return getDerivedHandle<LLFloater>(); } const LLSD& getKey() { return mKey; } virtual bool matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); } @@ -461,16 +461,9 @@ private: typedef void(*click_callback)(LLFloater*); static click_callback sButtonCallbacks[BUTTON_COUNT]; - typedef std::map<LLHandle<LLFloater>, LLFloater*> handle_map_t; - typedef std::map<LLHandle<LLFloater>, LLFloater*>::iterator handle_map_iter_t; - static handle_map_t sFloaterMap; - BOOL mHasBeenDraggedWhileMinimized; S32 mPreviousMinimizedBottom; S32 mPreviousMinimizedLeft; - -// LLFloaterNotificationContext* mNotificationContext; - LLRootHandle<LLFloater> mHandle; }; |