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, 153 insertions, 153 deletions

diff --git a/indra/newview/llconversationloglist.h b/indra/newview/llconversationloglist.h
index 3849319ed7..29cc082505 100644
--- a/indra/newview/llconversationloglist.h
+++ b/indra/newview/llconversationloglist.h
@@ -1,153 +1,153 @@
-/**
- * @file llconversationloglist.h
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2012, 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 LLCONVERSATIONLOGLIST_H_
-#define LLCONVERSATIONLOGLIST_H_
-
-#include "llconversationlog.h"
-#include "llflatlistview.h"
-#include "lltoggleablemenu.h"
-
-class LLConversationLogListItem;
-
-/**
- * List of all agent's conversations. I.e. history of conversations.
- * This list represents contents of the LLConversationLog.
- * Each change in LLConversationLog leads to rebuilding this list, so
- * it's always in actual state.
- */
-
-class LLConversationLogList: public LLFlatListViewEx, public LLConversationLogObserver
-{
-	LOG_CLASS(LLConversationLogList);
-public:
-
-	typedef enum e_sort_oder{
-		E_SORT_BY_NAME = 0,
-		E_SORT_BY_DATE = 1,
-	} ESortOrder;
-
-	struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
-	{
-		Params(){};
-	};
-
-	LLConversationLogList(const Params& p);
-	virtual ~LLConversationLogList();
-
-	virtual void draw();
-
-	virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask);
-
-	LLToggleableMenu*	getContextMenu() const { return mContextMenu.get(); }
-
-	void addNewItem(const LLConversation* conversation);
-	void setNameFilter(const std::string& filter);
-	void sortByName();
-	void sortByDate();
-	void toggleSortFriendsOnTop();
-	bool getSortFriendsOnTop() const { return mIsFriendsOnTop; }
-
-	/**
-	 * Changes from LLConversationLogObserver
-	 */
-	virtual void changed();
-	virtual void changed(const LLUUID& session_id, U32 mask);
-
-private:
-
-	void setDirty(bool dirty = true) { mIsDirty = dirty; }
-	void refresh();
-
-	/**
-	 * Clears list and re-adds items from LLConverstationLog
-	 * If filter is not empty re-adds items which match the filter
-	 */
-	void rebuildList();
-
-	bool findInsensitive(std::string haystack, const std::string& needle_upper);
-
-	void onCustomAction (const LLSD& userdata);
-	bool isActionEnabled(const LLSD& userdata);
-	bool isActionChecked(const LLSD& userdata);
-
-	LLIMModel::LLIMSession::SType getSelectedSessionType();
-	const LLConversationLogListItem* getSelectedConversationPanel();
-	const LLConversation* getSelectedConversation();
-	LLConversationLogListItem* getConversationLogListItem(const LLUUID& session_id);
-
-	ESortOrder getSortOrder();
-
-	LLHandle<LLToggleableMenu>	mContextMenu;
-	bool mIsDirty;
-	bool mIsFriendsOnTop;
-	std::string mNameFilter;
-};
-
-/**
- * Abstract comparator for ConversationLogList items
- */
-class LLConversationLogListItemComparator : public LLFlatListView::ItemComparator
-{
-	LOG_CLASS(LLConversationLogListItemComparator);
-
-public:
-	LLConversationLogListItemComparator() {};
-	virtual ~LLConversationLogListItemComparator() {};
-
-	virtual bool compare(const LLPanel* item1, const LLPanel* item2) const;
-
-protected:
-
-	virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const = 0;
-};
-
-class LLConversationLogListNameComparator : public LLConversationLogListItemComparator
-{
-	LOG_CLASS(LLConversationLogListNameComparator);
-
-public:
-	LLConversationLogListNameComparator() {};
-	virtual ~LLConversationLogListNameComparator() {};
-
-protected:
-
-	virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;
-};
-
-class LLConversationLogListDateComparator : public LLConversationLogListItemComparator
-{
-	LOG_CLASS(LLConversationLogListDateComparator);
-
-public:
-	LLConversationLogListDateComparator() {};
-	virtual ~LLConversationLogListDateComparator() {};
-
-protected:
-
-	virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;
-};
-
-#endif /* LLCONVERSATIONLOGLIST_H_ */
+/**

+ * @file llconversationloglist.h

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2012, 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 LLCONVERSATIONLOGLIST_H_

+#define LLCONVERSATIONLOGLIST_H_

+

+#include "llconversationlog.h"

+#include "llflatlistview.h"

+#include "lltoggleablemenu.h"

+

+class LLConversationLogListItem;

+

+/**

+ * List of all agent's conversations. I.e. history of conversations.

+ * This list represents contents of the LLConversationLog.

+ * Each change in LLConversationLog leads to rebuilding this list, so

+ * it's always in actual state.

+ */

+

+class LLConversationLogList: public LLFlatListViewEx, public LLConversationLogObserver

+{

+    LOG_CLASS(LLConversationLogList);

+public:

+

+    typedef enum e_sort_oder{

+        E_SORT_BY_NAME = 0,

+        E_SORT_BY_DATE = 1,

+    } ESortOrder;

+

+    struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>

+    {

+        Params(){};

+    };

+

+    LLConversationLogList(const Params& p);

+    virtual ~LLConversationLogList();

+

+    virtual void draw();

+

+    virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask);

+

+    LLToggleableMenu*   getContextMenu() const { return mContextMenu.get(); }

+

+    void addNewItem(const LLConversation* conversation);

+    void setNameFilter(const std::string& filter);

+    void sortByName();

+    void sortByDate();

+    void toggleSortFriendsOnTop();

+    bool getSortFriendsOnTop() const { return mIsFriendsOnTop; }

+

+    /**

+     * Changes from LLConversationLogObserver

+     */

+    virtual void changed();

+    virtual void changed(const LLUUID& session_id, U32 mask);

+

+private:

+

+    void setDirty(bool dirty = true) { mIsDirty = dirty; }

+    void refresh();

+

+    /**

+     * Clears list and re-adds items from LLConverstationLog

+     * If filter is not empty re-adds items which match the filter

+     */

+    void rebuildList();

+

+    bool findInsensitive(std::string haystack, const std::string& needle_upper);

+

+    void onCustomAction (const LLSD& userdata);

+    bool isActionEnabled(const LLSD& userdata);

+    bool isActionChecked(const LLSD& userdata);

+

+    LLIMModel::LLIMSession::SType getSelectedSessionType();

+    const LLConversationLogListItem* getSelectedConversationPanel();

+    const LLConversation* getSelectedConversation();

+    LLConversationLogListItem* getConversationLogListItem(const LLUUID& session_id);

+

+    ESortOrder getSortOrder();

+

+    LLHandle<LLToggleableMenu>  mContextMenu;

+    bool mIsDirty;

+    bool mIsFriendsOnTop;

+    std::string mNameFilter;

+};

+

+/**

+ * Abstract comparator for ConversationLogList items

+ */

+class LLConversationLogListItemComparator : public LLFlatListView::ItemComparator

+{

+    LOG_CLASS(LLConversationLogListItemComparator);

+

+public:

+    LLConversationLogListItemComparator() {};

+    virtual ~LLConversationLogListItemComparator() {};

+

+    virtual bool compare(const LLPanel* item1, const LLPanel* item2) const;

+

+protected:

+

+    virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const = 0;

+};

+

+class LLConversationLogListNameComparator : public LLConversationLogListItemComparator

+{

+    LOG_CLASS(LLConversationLogListNameComparator);

+

+public:

+    LLConversationLogListNameComparator() {};

+    virtual ~LLConversationLogListNameComparator() {};

+

+protected:

+

+    virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;

+};

+

+class LLConversationLogListDateComparator : public LLConversationLogListItemComparator

+{

+    LOG_CLASS(LLConversationLogListDateComparator);

+

+public:

+    LLConversationLogListDateComparator() {};

+    virtual ~LLConversationLogListDateComparator() {};

+

+protected:

+

+    virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;

+};

+

+#endif /* LLCONVERSATIONLOGLIST_H_ */