Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 113 insertions, 113 deletions

diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h
index 0f4a3eeea2..0171bb24d7 100644
--- a/indra/newview/llfloaterexperienceprofile.h
+++ b/indra/newview/llfloaterexperienceprofile.h
@@ -1,113 +1,113 @@
-/** 
- * @file llfloaterexperienceprofile.h
- * @brief llfloaterexperienceprofile and related class definitions
- *
- * $LicenseInfo:firstyear=2013&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2013, 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$
- */
-
-
-
-#ifndef LL_LLFLOATEREXPERIENCEPROFILE_H
-#define LL_LLFLOATEREXPERIENCEPROFILE_H
-
-#include "llfloater.h"
-#include "lluuid.h"
-#include "llsd.h"
-
-class LLLayoutPanel;
-class LLTextBox;
-class LLComboBox;
-
-class LLFloaterExperienceProfile : public LLFloater
-{
-    LOG_CLASS(LLFloaterExperienceProfile);
-public:
-    enum PostSaveAction
-    {
-        NOTHING,
-        CLOSE,
-        VIEW,
-    };
-
-
-    LLFloaterExperienceProfile(const LLSD& data);
-    virtual ~LLFloaterExperienceProfile();
-    
-    /* virtual */ bool matchesKey(const LLSD& key);
-
-    LLUUID getExperienceId() const { return mExperienceId; }
-    void setPreferences( const LLSD& content );
-
-
-    void refreshExperience(const LLSD& experience);
-    void onSaveComplete( const LLSD& content );
-    virtual bool canClose();
-
-    virtual void onClose(bool app_quitting);
-protected:
-    void onClickEdit();
-    void onClickPermission(const char* permission);
-    void onClickForget();
-    void onClickCancel();
-    void onClickSave();
-    void onClickLocation();
-	void onClickClear();
-	void onPickGroup();
-	void onFieldChanged();
-	void onReportExperience();
-
-	void setEditGroup(LLUUID group_id);
-
-    void changeToView();
-    void changeToEdit();
-
-    void experienceForgotten();
-    void experienceBlocked();
-    void experienceAllowed();
-
-    static void experienceCallback(LLHandle<LLFloaterExperienceProfile> handle, const LLSD& experience);
-    static bool experiencePermission(LLHandle<LLFloaterExperienceProfile> handle, const LLSD& permission);
-
-    bool postBuild();
-    bool setMaturityString(U8 maturity, LLTextBox* child, LLComboBox* combo);
-    bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, PostSaveAction action);
-    void doSave( int success_action );
-
-    void updatePackage();
-
-    void updatePermission( const LLSD& permission );
-    LLUUID mExperienceId;
-    LLSD mExperienceDetails;
-    LLSD mPackage;
-	std::string mLocationSLURL;
-    int mSaveCompleteAction;
-    bool mDirty;
-    bool mForceClose;
-    bool mPostEdit; // edit experience after opening and updating it
-private:
-    static bool hasPermission(const LLSD& content, const std::string &name, const LLUUID &test);
-    static void experiencePermissionResults(LLUUID exprienceId, LLSD result);
-    static void experienceIsAdmin(LLHandle<LLFloaterExperienceProfile> handle, const LLSD &result);
-    static void experienceUpdateResult(LLHandle<LLFloaterExperienceProfile> handle, const LLSD &result);
-};
-
-#endif // LL_LLFLOATEREXPERIENCEPROFILE_H
+/**

+ * @file llfloaterexperienceprofile.h

+ * @brief llfloaterexperienceprofile and related class definitions

+ *

+ * $LicenseInfo:firstyear=2013&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2013, 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$

+ */

+

+

+

+#ifndef LL_LLFLOATEREXPERIENCEPROFILE_H

+#define LL_LLFLOATEREXPERIENCEPROFILE_H

+

+#include "llfloater.h"

+#include "lluuid.h"

+#include "llsd.h"

+

+class LLLayoutPanel;

+class LLTextBox;

+class LLComboBox;

+

+class LLFloaterExperienceProfile : public LLFloater

+{

+    LOG_CLASS(LLFloaterExperienceProfile);

+public:

+    enum PostSaveAction

+    {

+        NOTHING,

+        CLOSE,

+        VIEW,

+    };

+

+

+    LLFloaterExperienceProfile(const LLSD& data);

+    virtual ~LLFloaterExperienceProfile();

+

+    /* virtual */ bool matchesKey(const LLSD& key);

+

+    LLUUID getExperienceId() const { return mExperienceId; }

+    void setPreferences( const LLSD& content );

+

+

+    void refreshExperience(const LLSD& experience);

+    void onSaveComplete( const LLSD& content );

+    virtual bool canClose();

+

+    virtual void onClose(bool app_quitting);

+protected:

+    void onClickEdit();

+    void onClickPermission(const char* permission);

+    void onClickForget();

+    void onClickCancel();

+    void onClickSave();

+    void onClickLocation();

+    void onClickClear();

+    void onPickGroup();

+    void onFieldChanged();

+    void onReportExperience();

+

+    void setEditGroup(LLUUID group_id);

+

+    void changeToView();

+    void changeToEdit();

+

+    void experienceForgotten();

+    void experienceBlocked();

+    void experienceAllowed();

+

+    static void experienceCallback(LLHandle<LLFloaterExperienceProfile> handle, const LLSD& experience);

+    static bool experiencePermission(LLHandle<LLFloaterExperienceProfile> handle, const LLSD& permission);

+

+    bool postBuild();

+    bool setMaturityString(U8 maturity, LLTextBox* child, LLComboBox* combo);

+    bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, PostSaveAction action);

+    void doSave( int success_action );

+

+    void updatePackage();

+

+    void updatePermission( const LLSD& permission );

+    LLUUID mExperienceId;

+    LLSD mExperienceDetails;

+    LLSD mPackage;

+    std::string mLocationSLURL;

+    int mSaveCompleteAction;

+    bool mDirty;

+    bool mForceClose;

+    bool mPostEdit; // edit experience after opening and updating it

+private:

+    static bool hasPermission(const LLSD& content, const std::string &name, const LLUUID &test);

+    static void experiencePermissionResults(LLUUID exprienceId, LLSD result);

+    static void experienceIsAdmin(LLHandle<LLFloaterExperienceProfile> handle, const LLSD &result);

+    static void experienceUpdateResult(LLHandle<LLFloaterExperienceProfile> handle, const LLSD &result);

+};

+

+#endif // LL_LLFLOATEREXPERIENCEPROFILE_H