Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 37 insertions, 37 deletions

diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp
index 8ed76b1df4..77fd37c741 100644
--- a/indra/newview/llfloaterloadprefpreset.cpp
+++ b/indra/newview/llfloaterloadprefpreset.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloateloadprefpreset.cpp
  * @brief Floater to load a graphics / camera preset
  *
  * $LicenseInfo:firstyear=2015&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2015, 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$
  */
@@ -36,28 +36,28 @@
 #include "llviewercontrol.h"
 
 LLFloaterLoadPrefPreset::LLFloaterLoadPrefPreset(const LLSD &key)
-:	LLFloater(key)
+:   LLFloater(key)
 {
 }
 
 // virtual
 BOOL LLFloaterLoadPrefPreset::postBuild()
 {
-	LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
-	if (preferences)
-	{
-		preferences->addDependentFloater(this);
-	}
-	getChild<LLButton>("ok")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnOk, this));
-	getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnCancel, this));
-	LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterLoadPrefPreset::onPresetsListChange, this));
+    LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+    if (preferences)
+    {
+        preferences->addDependentFloater(this);
+    }
+    getChild<LLButton>("ok")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnOk, this));
+    getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnCancel, this));
+    LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterLoadPrefPreset::onPresetsListChange, this));
 
-	return TRUE;
+    return TRUE;
 }
 
 void LLFloaterLoadPrefPreset::onOpen(const LLSD& key)
 {
-	mSubdirectory = key.asString();
+    mSubdirectory = key.asString();
     std::string title_type = std::string("title_") + mSubdirectory;
     if (hasString(title_type))
     {
@@ -70,41 +70,41 @@ void LLFloaterLoadPrefPreset::onOpen(const LLSD& key)
         setTitle(title_type);
     }
 
-	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+    LLComboBox* combo = getChild<LLComboBox>("preset_combo");
 
-	EDefaultOptions option = DEFAULT_TOP;
-	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
-	std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
-	if (!preset_graphic_active.empty())
-	{
-		combo->setSimple(preset_graphic_active);
-	}
+    EDefaultOptions option = DEFAULT_TOP;
+    LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+    std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
+    if (!preset_graphic_active.empty())
+    {
+        combo->setSimple(preset_graphic_active);
+    }
 }
 
 void LLFloaterLoadPrefPreset::onPresetsListChange()
 {
-	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+    LLComboBox* combo = getChild<LLComboBox>("preset_combo");
 
-	EDefaultOptions option = DEFAULT_TOP;
-	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
-	std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
-	if (!preset_graphic_active.empty())
-	{
-		combo->setSimple(preset_graphic_active);
-	}
+    EDefaultOptions option = DEFAULT_TOP;
+    LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+    std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
+    if (!preset_graphic_active.empty())
+    {
+        combo->setSimple(preset_graphic_active);
+    }
 }
 
 void LLFloaterLoadPrefPreset::onBtnCancel()
 {
-	closeFloater();
+    closeFloater();
 }
 
 void LLFloaterLoadPrefPreset::onBtnOk()
 {
-	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
-	std::string name = combo->getSimple();
+    LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+    std::string name = combo->getSimple();
 
-	LLPresetsManager::getInstance()->loadPreset(mSubdirectory, name);
+    LLPresetsManager::getInstance()->loadPreset(mSubdirectory, name);
 
-	closeFloater();
+    closeFloater();
 }