1 files changed, 187 insertions, 187 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index 8e4c853ec3..2f6d14d6b5 100644
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -1,187 +1,187 @@
-/**
- * @file llfloatersidepanelcontainer.cpp
- * @brief LLFloaterSidePanelContainer class definition
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterreg.h"
-#include "llfloatersidepanelcontainer.h"
-#include "llpaneleditwearable.h"
-
-// newview includes
-#include "llsidetraypanelcontainer.h"
-#include "lltransientfloatermgr.h"
-#include "llpaneloutfitedit.h"
-#include "llsidepanelappearance.h"
-
-//static
-const std::string LLFloaterSidePanelContainer::sMainPanelName("main_panel");
-
-LLFloaterSidePanelContainer::LLFloaterSidePanelContainer(const LLSD& key, const Params& params)
-:   LLFloater(key, params)
-{
-    // Prevent transient floaters (e.g. IM windows) from hiding
-    // when this floater is clicked.
-    LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::GLOBAL, this);
-}
-
-LLFloaterSidePanelContainer::~LLFloaterSidePanelContainer()
-{
-    LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::GLOBAL, this);
-}
-
-void LLFloaterSidePanelContainer::onOpen(const LLSD& key)
-{
-    getChild<LLPanel>(sMainPanelName)->onOpen(key);
-}
-
-void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
-{
-    LLPanelOutfitEdit* panel_outfit_edit =
-        dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::findPanel("appearance", "panel_outfit_edit"));
-    if (panel_outfit_edit)
-    {
-        LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);
-        if (parent == this )
-        {
-            LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
-            if (panel_appearance)
-            {
-                LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
-                if (edit_wearable_ptr)
-                {
-                    edit_wearable_ptr->onClose();
-                }
-                if (!app_quitting)
-                {
-                    panel_appearance->showOutfitsInventoryPanel();
-                }
-            }
-        }
-    }
-
-    LLFloater::closeFloater(app_quitting);
-
-    if (getInstanceName() == "inventory" && !getKey().isUndefined())
-    {
-        destroy();
-    }
-}
-
-LLFloater* LLFloaterSidePanelContainer::getTopmostInventoryFloater()
-{
-    LLFloater* topmost_floater = NULL;
-    S32 z_min = S32_MAX;
-
-    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
-    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
-    {
-        LLFloater* inventory_floater = (*iter);
-
-        if (inventory_floater && inventory_floater->getVisible())
-        {
-            S32 z_order = gFloaterView->getZOrder(inventory_floater);
-            if (z_order < z_min)
-            {
-                z_min = z_order;
-                topmost_floater = inventory_floater;
-            }
-        }
-    }
-    return topmost_floater;
-}
-
-LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)
-{
-    LLView* view = findChildView(panel_name, true);
-    if (!view)
-        return NULL;
-
-    if (!getVisible())
-    {
-        openFloater();
-    }
-    else if (!hasFocus())
-    {
-        setFocus(true);
-    }
-
-    LLPanel* panel = NULL;
-
-    LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent());
-    if (container)
-    {
-        container->openPanel(panel_name, params);
-        panel = container->getCurrentPanel();
-    }
-    else if ((panel = dynamic_cast<LLPanel*>(view)) != NULL)
-    {
-        panel->onOpen(params);
-    }
-
-    return panel;
-}
-
-void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const LLSD& key)
-{
-    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-    if (floaterp)
-    {
-        floaterp->openChildPanel(sMainPanelName, key);
-    }
-}
-
-void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key)
-{
-    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-    if (floaterp)
-    {
-        floaterp->openChildPanel(panel_name, key);
-    }
-}
-
-LLPanel* LLFloaterSidePanelContainer::getPanel(const std::string& floater_name, const std::string& panel_name)
-{
-    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-
-    if (floaterp)
-    {
-        return floaterp->findChild<LLPanel>(panel_name, true);
-    }
-
-    return NULL;
-}
-
-LLPanel* LLFloaterSidePanelContainer::findPanel(const std::string& floater_name, const std::string& panel_name)
-{
-    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::findTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-
-    if (floaterp)
-    {
-        return floaterp->findChild<LLPanel>(panel_name, true);
-    }
-
-    return NULL;
-}
+/**
+ * @file llfloatersidepanelcontainer.cpp
+ * @brief LLFloaterSidePanelContainer class definition
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, 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$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterreg.h"
+#include "llfloatersidepanelcontainer.h"
+#include "llpaneleditwearable.h"
+
+// newview includes
+#include "llsidetraypanelcontainer.h"
+#include "lltransientfloatermgr.h"
+#include "llpaneloutfitedit.h"
+#include "llsidepanelappearance.h"
+
+//static
+const std::string LLFloaterSidePanelContainer::sMainPanelName("main_panel");
+
+LLFloaterSidePanelContainer::LLFloaterSidePanelContainer(const LLSD& key, const Params& params)
+:   LLFloater(key, params)
+{
+    // Prevent transient floaters (e.g. IM windows) from hiding
+    // when this floater is clicked.
+    LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::GLOBAL, this);
+}
+
+LLFloaterSidePanelContainer::~LLFloaterSidePanelContainer()
+{
+    LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::GLOBAL, this);
+}
+
+void LLFloaterSidePanelContainer::onOpen(const LLSD& key)
+{
+    getChild<LLPanel>(sMainPanelName)->onOpen(key);
+}
+
+void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
+{
+    LLPanelOutfitEdit* panel_outfit_edit =
+        dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::findPanel("appearance", "panel_outfit_edit"));
+    if (panel_outfit_edit)
+    {
+        LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);
+        if (parent == this )
+        {
+            LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
+            if (panel_appearance)
+            {
+                LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
+                if (edit_wearable_ptr)
+                {
+                    edit_wearable_ptr->onClose();
+                }
+                if (!app_quitting)
+                {
+                    panel_appearance->showOutfitsInventoryPanel();
+                }
+            }
+        }
+    }
+
+    LLFloater::closeFloater(app_quitting);
+
+    if (getInstanceName() == "inventory" && !getKey().isUndefined())
+    {
+        destroy();
+    }
+}
+
+LLFloater* LLFloaterSidePanelContainer::getTopmostInventoryFloater()
+{
+    LLFloater* topmost_floater = NULL;
+    S32 z_min = S32_MAX;
+
+    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
+    {
+        LLFloater* inventory_floater = (*iter);
+
+        if (inventory_floater && inventory_floater->getVisible())
+        {
+            S32 z_order = gFloaterView->getZOrder(inventory_floater);
+            if (z_order < z_min)
+            {
+                z_min = z_order;
+                topmost_floater = inventory_floater;
+            }
+        }
+    }
+    return topmost_floater;
+}
+
+LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)
+{
+    LLView* view = findChildView(panel_name, true);
+    if (!view)
+        return NULL;
+
+    if (!getVisible())
+    {
+        openFloater();
+    }
+    else if (!hasFocus())
+    {
+        setFocus(true);
+    }
+
+    LLPanel* panel = NULL;
+
+    LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent());
+    if (container)
+    {
+        container->openPanel(panel_name, params);
+        panel = container->getCurrentPanel();
+    }
+    else if ((panel = dynamic_cast<LLPanel*>(view)) != NULL)
+    {
+        panel->onOpen(params);
+    }
+
+    return panel;
+}
+
+void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const LLSD& key)
+{
+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
+    if (floaterp)
+    {
+        floaterp->openChildPanel(sMainPanelName, key);
+    }
+}
+
+void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key)
+{
+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
+    if (floaterp)
+    {
+        floaterp->openChildPanel(panel_name, key);
+    }
+}
+
+LLPanel* LLFloaterSidePanelContainer::getPanel(const std::string& floater_name, const std::string& panel_name)
+{
+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
+
+    if (floaterp)
+    {
+        return floaterp->findChild<LLPanel>(panel_name, true);
+    }
+
+    return NULL;
+}
+
+LLPanel* LLFloaterSidePanelContainer::findPanel(const std::string& floater_name, const std::string& panel_name)
+{
+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::findTypedInstance<LLFloaterSidePanelContainer>(floater_name);
+
+    if (floaterp)
+    {
+        return floaterp->findChild<LLPanel>(panel_name, true);
+    }
+
+    return NULL;
+}