Pull merge from lindenlab/viewer-developement

1 files changed, 3 insertions, 4 deletions

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 9ad566a1a1..a6a85fc7d1 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -329,12 +329,10 @@ public:
 	bool isTornOff() {return mTornOff;}
 	void setOpenPositioning(LLFloaterEnums::EOpenPositioning pos) {mPositioning = pos;}
 
-	// Return a closeable floater, if any, given the current focus.
-	static LLFloater* getClosableFloaterFromFocus(); 
 
-	// Close the floater returned by getClosableFloaterFromFocus() and 
+	// Close the floater returned by getFrontmostClosableFloater() and 
 	// handle refocusing.
-	static void		closeFocusedFloater();
+	static void		closeFrontmostFloater();
 
 //	LLNotification::Params contextualNotification(const std::string& name) 
 //	{ 
@@ -564,6 +562,7 @@ public:
 	S32 getZOrder(LLFloater* child);
 
 	void setFloaterSnapView(LLHandle<LLView> snap_view) {mSnapView = snap_view; }
+	LLFloater* getFrontmostClosableFloater(); 
 
 private:
 	void hiddenFloaterClosed(LLFloater* floater);