Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llnotificationstorage.h b/indra/newview/llnotificationstorage.h
index 21d7123747..6d7c3f79f3 100644
--- a/indra/newview/llnotificationstorage.h
+++ b/indra/newview/llnotificationstorage.h
@@ -5,21 +5,21 @@
 * $LicenseInfo:firstyear=2010&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$
 */
@@ -36,22 +36,22 @@ class LLSD;
 
 class LLNotificationStorage
 {
-	LOG_CLASS(LLNotificationStorage);
+    LOG_CLASS(LLNotificationStorage);
 public:
-	LLNotificationStorage(std::string pFileName);
-	~LLNotificationStorage();
+    LLNotificationStorage(std::string pFileName);
+    ~LLNotificationStorage();
 
 protected:
-	bool writeNotifications(const LLSD& pNotificationData) const;
-	bool readNotifications(LLSD& pNotificationData, bool is_new_filename = true) const;
-	void setFileName(std::string pFileName) {mFileName = pFileName;}
-	void setOldFileName(std::string pFileName) {mOldFileName = pFileName;}
+    bool writeNotifications(const LLSD& pNotificationData) const;
+    bool readNotifications(LLSD& pNotificationData, bool is_new_filename = true) const;
+    void setFileName(std::string pFileName) {mFileName = pFileName;}
+    void setOldFileName(std::string pFileName) {mOldFileName = pFileName;}
 
-	LLNotificationResponderInterface* createResponder(const std::string& pNotificationName, const LLSD& pParams) const;
+    LLNotificationResponderInterface* createResponder(const std::string& pNotificationName, const LLSD& pParams) const;
 
 private:
-	std::string mFileName;
-	std::string mOldFileName;
+    std::string mFileName;
+    std::string mOldFileName;
 };
 
 #endif // LL_NOTIFICATIONSTORAGE_H