From b6858df0dd9fa06ec8fa56c5ba63925a790b4811 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Nov 2011 13:47:08 -0800
Subject: LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and
 LLHandle<Base> can be downcast to LLHandle<Derived> using the
 LLHandleProvider mixin

---
 indra/llui/llfloater.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'indra/llui/llfloater.h')

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;	
 };
 
 
-- 
cgit v1.2.3


From 98755a62bb414f23919e003101153c20d3ab3f72 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 14 Nov 2011 15:39:32 -0800
Subject: EXP-1588 WIP Floaters do not snap to edge

---
 indra/llui/llfloater.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui/llfloater.h')

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 73e9c9e831..4e8c539144 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -537,6 +537,7 @@ public:
 private:
 	void hiddenFloaterClosed(LLFloater* floater);
 
+	LLRect				mLastSnapRect;
 	LLHandle<LLView>	mSnapView;
 	BOOL			mFocusCycleMode;
 	S32				mSnapOffsetBottom;
-- 
cgit v1.2.3


From 30beda590a93aca9b2a27edb9be94665290c2e7c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 15 Nov 2011 16:40:31 -0800
Subject: EXP-1588 FIX Floaters do not snap to edge made non-movable floaters
 not use auto-follow logic toasts will now use own layout logic

---
 indra/llui/llfloater.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui/llfloater.h')

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 4e8c539144..8886ae3393 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -234,6 +234,7 @@ public:
 	void			setCanTearOff(BOOL can_tear_off);
 	virtual void	setCanResize(BOOL can_resize);
 	void			setCanDrag(BOOL can_drag);
+	bool			getCanDrag();
 	void			setHost(LLMultiFloater* host);
 	BOOL			isResizable() const				{ return mResizable; }
 	void			setResizeLimits( S32 min_width, S32 min_height );
-- 
cgit v1.2.3


From afc19140575fb96826b12139d77c5b2174c4713e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 7 Dec 2011 11:47:33 -0800
Subject: EXP-1652 FIX (Build tool floater size affected by viewer window size)
 force all floaters to have follows flags = FOLLOWS_NONE and use
 llfloaterview::reshape logic instead removed existing follows flags from any
 floater XUI and deprecated the follows parameter for floaters

---
 indra/llui/llfloater.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llui/llfloater.h')

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index c70eb0958d..59b35d206f 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -156,6 +156,8 @@ public:
 		
 		Optional<CommitCallbackParam> open_callback,
 									  close_callback;
+
+		Ignored					follows;
 		
 		Params();
 	};
-- 
cgit v1.2.3