Merge branch 'release/luau-scripting' into lua-speedometer-demo

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llfloatercamerapresets.cpp b/indra/newview/llfloatercamerapresets.cpp
index a1cbffd094..68897804f3 100644
--- a/indra/newview/llfloatercamerapresets.cpp
+++ b/indra/newview/llfloatercamerapresets.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
 * @file llfloatercamerapresets.cpp
 *
 * $LicenseInfo:firstyear=2019&license=viewerlgpl$
 * Second Life Viewer Source Code
 * Copyright (C) 2019, 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$
 */
@@ -32,7 +32,7 @@
 #include "llviewercontrol.h"
 
 LLFloaterCameraPresets::LLFloaterCameraPresets(const LLSD& key)
-:	LLFloater(key)
+:   LLFloater(key)
 {}
 
 LLFloaterCameraPresets::~LLFloaterCameraPresets()
@@ -59,7 +59,7 @@ void LLFloaterCameraPresets::populateList()
     LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
     std::list<std::string> preset_names;
 
-	presetsMgr->loadPresetNamesFromDir(PRESETS_CAMERA, preset_names, DEFAULT_BOTTOM);
+    presetsMgr->loadPresetNamesFromDir(PRESETS_CAMERA, preset_names, DEFAULT_BOTTOM);
     std::string active_preset = gSavedSettings.getString("PresetCameraActive");
 
     for (std::list<std::string>::const_iterator it = preset_names.begin(); it != preset_names.end(); ++it)
@@ -90,8 +90,8 @@ LLCameraPresetFlatItem::LLCameraPresetFlatItem(const std::string &preset_name, b
     mPresetName(preset_name),
     mIsDefaultPrest(is_default)
 {
-    mCommitCallbackRegistrar.add("CameraPresets.Delete", boost::bind(&LLCameraPresetFlatItem::onDeleteBtnClick, this));
-    mCommitCallbackRegistrar.add("CameraPresets.Reset", boost::bind(&LLCameraPresetFlatItem::onResetBtnClick, this));
+    mCommitCallbackRegistrar.add("CameraPresets.Delete", { boost::bind(&LLCameraPresetFlatItem::onDeleteBtnClick, this), cb_info::UNTRUSTED_BLOCK });
+    mCommitCallbackRegistrar.add("CameraPresets.Reset", { boost::bind(&LLCameraPresetFlatItem::onResetBtnClick, this), cb_info::UNTRUSTED_BLOCK });
     buildFromFile("panel_camera_preset_item.xml");
 }
 
@@ -149,7 +149,7 @@ void LLCameraPresetFlatItem::onDeleteBtnClick()
         args["NAME"] = mPresetName;
         LLNotificationsUtil::add("PresetNotDeleted", args);
     }
-	else if (gSavedSettings.getString("PresetCameraActive") == mPresetName)
+    else if (gSavedSettings.getString("PresetCameraActive") == mPresetName)
     {
         gSavedSettings.setString("PresetCameraActive", "");
     }