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

diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index ccb2feac10..9fc1e72c89 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -1,132 +1,132 @@
-/** 
- * @file llplacesinventorypanel.cpp
- * @brief LLPlacesInventoryPanel  class definition
- *
- * $LicenseInfo:firstyear=2009&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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llscrollcontainer.h"
-
-#include "llplacesinventorypanel.h"
-
-#include "llfolderviewmodel.h"
-#include "llplacesfolderview.h"
-#include "llinventorybridge.h"
-#include "llinventoryfunctions.h"
-#include "llpanellandmarks.h"
-#include "llplacesinventorybridge.h"
-#include "llviewerfoldertype.h"
-
-static LLDefaultChildRegistry::Register<LLPlacesInventoryPanel> r("places_inventory_panel");
-
-static const LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER;
-
-LLPlacesInventoryPanel::LLPlacesInventoryPanel(const Params& p) : 
-    LLAssetFilteredInventoryPanel(p),
-	mSavedFolderState(NULL)
-{
-	mInvFVBridgeBuilder = &PLACES_INVENTORY_BUILDER;
-	mSavedFolderState = new LLSaveFolderState();
-	mSavedFolderState->setApply(false);
-}
-
-
-LLPlacesInventoryPanel::~LLPlacesInventoryPanel()
-{
-	delete mSavedFolderState;
-}
-
-
-LLFolderView * LLPlacesInventoryPanel::createFolderRoot(LLUUID root_id )
-{
-    LLPlacesFolderView::Params p;
-    
-    p.name = getName();
-    p.title = getLabel();
-    p.rect = LLRect(0, 0, getRect().getWidth(), 0);
-    p.parent_panel = this;
-    p.tool_tip = p.name;
-    p.listener = mInvFVBridgeBuilder->createBridge(	LLAssetType::AT_CATEGORY,
-        LLAssetType::AT_CATEGORY,
-        LLInventoryType::IT_CATEGORY,
-        this,
-        &mInventoryViewModel,
-        NULL,
-        root_id);
-    p.view_model = &mInventoryViewModel;
-    p.use_label_suffix = mParams.use_label_suffix;
-    p.allow_multiselect = mAllowMultiSelect;
-    p.allow_drag = mAllowDrag;
-    p.show_empty_message = mShowEmptyMessage;
-    p.show_item_link_overlays = mShowItemLinkOverlays;
-    p.root = NULL;
-    p.use_ellipses = mParams.folder_view.use_ellipses;
-    p.options_menu = "menu_inventory.xml";
-
-    return LLUICtrlFactory::create<LLPlacesFolderView>(p);
-}
-
-// save current folder open state
-void LLPlacesInventoryPanel::saveFolderState()
-{
-	mSavedFolderState->setApply(false);
-	mFolderRoot.get()->applyFunctorRecursively(*mSavedFolderState);
-}
-
-// re-open folders which state was saved
-void LLPlacesInventoryPanel::restoreFolderState()
-{
-	mSavedFolderState->setApply(true);
-	mFolderRoot.get()->applyFunctorRecursively(*mSavedFolderState);
-	LLOpenFoldersWithSelection opener;
-	mFolderRoot.get()->applyFunctorRecursively(opener);
-	mFolderRoot.get()->scrollToShowSelection();
-}
-
-S32	LLPlacesInventoryPanel::notify(const LLSD& info) 
-{
-	if(info.has("action"))
-	{
-		std::string str_action = info["action"];
-		if(str_action == "select_first")
-		{
-			return mFolderRoot.get()->notify(info);
-		}
-		else if(str_action == "select_last")
-		{
-			return mFolderRoot.get()->notify(info);
-		}
-	}
-	return 0;
-}
-
-bool LLPlacesInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data,
-                                                      EAcceptance *accept, std::string &tooltip_msg)
-{
-    if (mAcceptsDragAndDrop) 
-    {
-        return LLInventoryPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
-    }
-    return false;
-}
+/**

+ * @file llplacesinventorypanel.cpp

+ * @brief LLPlacesInventoryPanel  class definition

+ *

+ * $LicenseInfo:firstyear=2009&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$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llscrollcontainer.h"

+

+#include "llplacesinventorypanel.h"

+

+#include "llfolderviewmodel.h"

+#include "llplacesfolderview.h"

+#include "llinventorybridge.h"

+#include "llinventoryfunctions.h"

+#include "llpanellandmarks.h"

+#include "llplacesinventorybridge.h"

+#include "llviewerfoldertype.h"

+

+static LLDefaultChildRegistry::Register<LLPlacesInventoryPanel> r("places_inventory_panel");

+

+static const LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER;

+

+LLPlacesInventoryPanel::LLPlacesInventoryPanel(const Params& p) :

+    LLAssetFilteredInventoryPanel(p),

+    mSavedFolderState(NULL)

+{

+    mInvFVBridgeBuilder = &PLACES_INVENTORY_BUILDER;

+    mSavedFolderState = new LLSaveFolderState();

+    mSavedFolderState->setApply(false);

+}

+

+

+LLPlacesInventoryPanel::~LLPlacesInventoryPanel()

+{

+    delete mSavedFolderState;

+}

+

+

+LLFolderView * LLPlacesInventoryPanel::createFolderRoot(LLUUID root_id )

+{

+    LLPlacesFolderView::Params p;

+

+    p.name = getName();

+    p.title = getLabel();

+    p.rect = LLRect(0, 0, getRect().getWidth(), 0);

+    p.parent_panel = this;

+    p.tool_tip = p.name;

+    p.listener = mInvFVBridgeBuilder->createBridge( LLAssetType::AT_CATEGORY,

+        LLAssetType::AT_CATEGORY,

+        LLInventoryType::IT_CATEGORY,

+        this,

+        &mInventoryViewModel,

+        NULL,

+        root_id);

+    p.view_model = &mInventoryViewModel;

+    p.use_label_suffix = mParams.use_label_suffix;

+    p.allow_multiselect = mAllowMultiSelect;

+    p.allow_drag = mAllowDrag;

+    p.show_empty_message = mShowEmptyMessage;

+    p.show_item_link_overlays = mShowItemLinkOverlays;

+    p.root = NULL;

+    p.use_ellipses = mParams.folder_view.use_ellipses;

+    p.options_menu = "menu_inventory.xml";

+

+    return LLUICtrlFactory::create<LLPlacesFolderView>(p);

+}

+

+// save current folder open state

+void LLPlacesInventoryPanel::saveFolderState()

+{

+    mSavedFolderState->setApply(false);

+    mFolderRoot.get()->applyFunctorRecursively(*mSavedFolderState);

+}

+

+// re-open folders which state was saved

+void LLPlacesInventoryPanel::restoreFolderState()

+{

+    mSavedFolderState->setApply(true);

+    mFolderRoot.get()->applyFunctorRecursively(*mSavedFolderState);

+    LLOpenFoldersWithSelection opener;

+    mFolderRoot.get()->applyFunctorRecursively(opener);

+    mFolderRoot.get()->scrollToShowSelection();

+}

+

+S32 LLPlacesInventoryPanel::notify(const LLSD& info)

+{

+    if(info.has("action"))

+    {

+        std::string str_action = info["action"];

+        if(str_action == "select_first")

+        {

+            return mFolderRoot.get()->notify(info);

+        }

+        else if(str_action == "select_last")

+        {

+            return mFolderRoot.get()->notify(info);

+        }

+    }

+    return 0;

+}

+

+bool LLPlacesInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data,

+                                                      EAcceptance *accept, std::string &tooltip_msg)

+{

+    if (mAcceptsDragAndDrop)

+    {

+        return LLInventoryPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);

+    }

+    return false;

+}