Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 41 insertions, 41 deletions

diff --git a/indra/newview/llfloaterhandler.cpp b/indra/newview/llfloaterhandler.cpp
index b66049de7f..5823ad3e41 100644
--- a/indra/newview/llfloaterhandler.cpp
+++ b/indra/newview/llfloaterhandler.cpp
@@ -1,22 +1,22 @@
-/** 
+/**
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -34,46 +34,46 @@ LLFloaterHandler gFloaterHandler;
 
 LLFloater* get_parent_floater(LLView* view)
 {
-	LLFloater* floater = NULL;
-	LLView* parent = view->getParent();
-	while (parent)
-	{
-		floater = dynamic_cast<LLFloater*>(parent);
-		if (floater)
-		{
-			break;
-		}
-		parent = parent->getParent();
-	}
-	return floater;
+    LLFloater* floater = NULL;
+    LLView* parent = view->getParent();
+    while (parent)
+    {
+        floater = dynamic_cast<LLFloater*>(parent);
+        if (floater)
+        {
+            break;
+        }
+        parent = parent->getParent();
+    }
+    return floater;
 }
 
 
 bool LLFloaterHandler::handle(const LLSD &params, const LLSD &query_map, const std::string& grid, LLMediaCtrl *web)
 {
-	if (params.size() < 1) return false;
-	LLFloater* floater = NULL;
-	// *TODO: implement floater lookup by name
+    if (params.size() < 1) return false;
+    LLFloater* floater = NULL;
+    // *TODO: implement floater lookup by name
 
-	if (params[0].asString() == "destinations")
-	{
-		LLFloaterReg::toggleInstanceOrBringToFront("destinations");
-		return true;
-	}
-	if (params[0].asString() == "self")
-	{
-		if (web)
-		{
-			floater = get_parent_floater(web);
-		}
-	}
-	if (params[1].asString() == "close")
-	{
-		if (floater)
-		{
-			floater->closeFloater();
-			return true;
-		}
-	}
-	return false;
+    if (params[0].asString() == "destinations")
+    {
+        LLFloaterReg::toggleInstanceOrBringToFront("destinations");
+        return true;
+    }
+    if (params[0].asString() == "self")
+    {
+        if (web)
+        {
+            floater = get_parent_floater(web);
+        }
+    }
+    if (params[1].asString() == "close")
+    {
+        if (floater)
+        {
+            floater->closeFloater();
+            return true;
+        }
+    }
+    return false;
 }