diff options
| author | Richard Linden <none@none> | 2011-11-08 13:47:08 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-08 13:47:08 -0800 |
| commit | b6858df0dd9fa06ec8fa56c5ba63925a790b4811 (patch) | |
| tree | 9298d771c580d1f98d107571a8eea83ff5875164 /indra/llui/llfloater.h | |
| parent | d6d4bfa02a46c5c7f2e5376b9fad79f2624dda83 (diff) | |
LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and LLHandle<Base>
can be downcast to LLHandle<Derived> using the LLHandleProvider mixin
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 73e9c9e831..b24ae1beb9 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; @@ -282,7 +282,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); } @@ -460,16 +460,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; }; |