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

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index 5ce5716cf2..153121d4e8 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -1,375 +1,375 @@
-/** 
- * @file llpanelmarketplaceinboxinventory.cpp
- * @brief LLInboxInventoryPanel  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 "llpanelmarketplaceinboxinventory.h"
-
-#include "llfolderview.h"
-#include "llfolderviewitem.h"
-#include "llfolderviewmodel.h"
-#include "llinventorybridge.h"
-#include "llinventoryfunctions.h"
-#include "llpanellandmarks.h"
-#include "llplacesinventorybridge.h"
-#include "llviewerfoldertype.h"
-#include "llsdserialize.h"
-
-
-#define DEBUGGING_FRESHNESS	0
-
-const LLColor4U DEFAULT_WHITE(255, 255, 255);
-
-const std::string NEW_INBOX_FILENAME("inbox_new_items.xml");
-
-//
-// statics
-//
-
-static LLDefaultChildRegistry::Register<LLInboxInventoryPanel> r1("inbox_inventory_panel");
-static LLDefaultChildRegistry::Register<LLInboxFolderViewFolder> r2("inbox_folder_view_folder");
-static LLDefaultChildRegistry::Register<LLInboxFolderViewItem> r3("inbox_folder_view_item");
-
-
-//
-// LLInboxInventoryPanel Implementation
-//
-
-LLInboxInventoryPanel::LLInboxInventoryPanel(const LLInboxInventoryPanel::Params& p)
-:	LLInventoryPanel(p)
-{
-	LLInboxNewItemsStorage::getInstance()->load();
-    LLInboxNewItemsStorage::getInstance()->addInboxPanel(this);
-}
-
-LLInboxInventoryPanel::~LLInboxInventoryPanel()
-{
-    LLInboxNewItemsStorage::getInstance()->removeInboxPanel(this);
-}
-
-void LLInboxInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
-{
-	LLInventoryPanel::initFromParams(params);
-	getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() | (1ULL << LLFolderType::FT_INBOX));
-}
-
-LLFolderViewFolder * LLInboxInventoryPanel::createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop)
-{
-	LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
-
-	LLInboxFolderViewFolder::Params params;
-	
-	params.name = bridge->getDisplayName();
-	params.root = mFolderRoot.get();
-	params.listener = bridge;
-	params.tool_tip = params.name;
-	params.font_color = item_color;
-	params.font_highlight_color = item_color;
-    params.allow_drop = allow_drop;
-	
-	return LLUICtrlFactory::create<LLInboxFolderViewFolder>(params);
-}
-
-LLFolderViewItem * LLInboxInventoryPanel::createFolderViewItem(LLInvFVBridge * bridge)
-{
-	LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
-
-	LLInboxFolderViewItem::Params params;
-
-	params.name = bridge->getDisplayName();
-	params.creation_date = bridge->getCreationDate();
-	params.root = mFolderRoot.get();
-	params.listener = bridge;
-	params.rect = LLRect (0, 0, 0, 0);
-	params.tool_tip = params.name;
-	params.font_color = item_color;
-	params.font_highlight_color = item_color;
-
-	return LLUICtrlFactory::create<LLInboxFolderViewItem>(params);
-}
-
-void LLInboxInventoryPanel::onRemoveItemFreshness(const LLUUID& item_id)
-{
-    LLInboxFolderViewFolder* inbox_folder_view = dynamic_cast<LLInboxFolderViewFolder*>(getFolderByID(item_id));
-    if(inbox_folder_view)
-    {
-        inbox_folder_view->setFresh(false);
-    }
-
-    LLInboxFolderViewItem* inbox_item_view = dynamic_cast<LLInboxFolderViewItem*>(getItemByID(item_id));
-    if(inbox_item_view)
-    {
-        inbox_item_view->setFresh(false);
-    }
-}
-
-//
-// LLInboxFolderViewFolder Implementation
-//
-
-LLInboxFolderViewFolder::LLInboxFolderViewFolder(const Params& p)
-:	LLFolderViewFolder(p),
-	LLBadgeOwner(getHandle()),
-	mFresh(false)
-{
-	initBadgeParams(p.new_badge());
-}
-
-void LLInboxFolderViewFolder::addItem(LLFolderViewItem* item)
-{
-    LLFolderViewFolder::addItem(item);
-
-    if(item)
-    {
-        LLInvFVBridge* itemBridge = static_cast<LLInvFVBridge*>(item->getViewModelItem());
-        LLFolderBridge * bridge = static_cast<LLFolderBridge *>(getViewModelItem());
-        bridge->updateHierarchyCreationDate(itemBridge->getCreationDate());
-    }
-
-    // Compute freshness if our parent is the root folder for the inbox
-    if ((mParentFolder == mRoot) && !mFresh)
-    {
-        computeFreshness();
-    }
-}
-
-// virtual
-void LLInboxFolderViewFolder::draw()
-{
-	if (!hasBadgeHolderParent())
-	{
-		addBadgeToParentHolder();
-		setDrawBadgeAtTop(true);
-	}
-
-	setBadgeVisibility(mFresh);
-
-	LLFolderViewFolder::draw();
-
-	if (mFresh)
-	{
-		reshapeBadge(getRect());
-	}
-
-}
-
-bool LLInboxFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )
-{
-	deFreshify();
-	return LLFolderViewFolder::handleMouseDown(x, y, mask);
-}
-
-bool LLInboxFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
-{
-	deFreshify();
-	return LLFolderViewFolder::handleDoubleClick(x, y, mask);
-}
-
-void LLInboxFolderViewFolder::selectItem()
-{
-	deFreshify();
-	LLFolderViewFolder::selectItem();
-}
-
-void LLInboxFolderViewFolder::computeFreshness()
-{
-	LLFolderViewModelItemInventory* view_model = static_cast<LLFolderViewModelItemInventory*>(getViewModelItem());
-	const U32 last_expansion_utc = gSavedPerAccountSettings.getU32("LastInventoryInboxActivity");
-
-	if (last_expansion_utc > 0)
-	{
-		mFresh = (view_model->getCreationDate() > last_expansion_utc) || LLInboxNewItemsStorage::getInstance()->isItemFresh(view_model->getUUID());
-
-#if DEBUGGING_FRESHNESS
-		if (mFresh)
-		{
-			LL_INFOS() << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion_utc << LL_ENDL;
-		}
-#endif
-	}
-	else
-	{
-		mFresh = true;
-	}
-
-	if (mFresh)
-	{
-		LLInboxNewItemsStorage::getInstance()->addFreshItem(view_model->getUUID());
-	}
-}
-
-void LLInboxFolderViewFolder::deFreshify()
-{
-	mFresh = false;
-
-	gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());
-	LLInboxNewItemsStorage::getInstance()->removeItem(static_cast<LLFolderViewModelItemInventory*>(getViewModelItem())->getUUID());
-}
-
-//
-// LLInboxFolderViewItem Implementation
-//
-
-LLInboxFolderViewItem::LLInboxFolderViewItem(const Params& p)
-	: LLFolderViewItem(p)
-	, LLBadgeOwner(getHandle())
-	, mFresh(false)
-{
-	initBadgeParams(p.new_badge());
-}
-
-void LLInboxFolderViewItem::addToFolder(LLFolderViewFolder* folder)
-{
-	LLFolderViewItem::addToFolder(folder);
-
-	// Compute freshness if our parent is the root folder for the inbox
-	if (mParentFolder == mRoot)
-	{
-		computeFreshness();
-	}
-}
-
-bool LLInboxFolderViewItem::handleDoubleClick(S32 x, S32 y, MASK mask)
-{
-	deFreshify();
-	
-	return LLFolderViewItem::handleDoubleClick(x, y, mask);
-}
-
-// virtual
-void LLInboxFolderViewItem::draw()
-{
-	if (!hasBadgeHolderParent())
-	{
-		addBadgeToParentHolder();
-	}
-
-	setBadgeVisibility(mFresh);
-
-	LLFolderViewItem::draw();
-}
-
-void LLInboxFolderViewItem::selectItem()
-{
-	deFreshify();
-
-	LLFolderViewItem::selectItem();
-}
-
-void LLInboxFolderViewItem::computeFreshness()
-{
-	const U32 last_expansion_utc = gSavedPerAccountSettings.getU32("LastInventoryInboxActivity");
-
-	if (last_expansion_utc > 0)
-	{
-		mFresh = (static_cast<LLFolderViewModelItemInventory*>(getViewModelItem())->getCreationDate() > last_expansion_utc);
-
-#if DEBUGGING_FRESHNESS
-		if (mFresh)
-		{
-			LL_INFOS() << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion_utc << LL_ENDL;
-		}
-#endif
-	}
-	else
-	{
-		mFresh = true;
-	}
-}
-
-void LLInboxFolderViewItem::deFreshify()
-{
-	mFresh = false;
-
-	gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());
-}
-
-LLInboxNewItemsStorage::LLInboxNewItemsStorage()
-{
-}
-
-// static
-void LLInboxNewItemsStorage::destroyClass()
-{
-	LLInboxNewItemsStorage::getInstance()->saveNewItemsIds();
-}
-
-void LLInboxNewItemsStorage::saveNewItemsIds()
-{
-	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, NEW_INBOX_FILENAME);
-	if (!filename.empty())
-	{
-		LLSD uuids_data;
-		for (std::set<LLUUID>::const_iterator it = mNewItemsIDs.begin(); it != mNewItemsIDs.end(); it++)
-		{
-			uuids_data.append((*it));
-		}
-
-		llofstream file;
-		file.open(filename.c_str());
-		if ( file.is_open() )
-		{
-			LLSDSerialize::toPrettyXML(uuids_data, file);
-			file.close();
-		}
-	}
-}
-
-void LLInboxNewItemsStorage::load()
-{
-	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, NEW_INBOX_FILENAME);
-	if (!filename.empty())
-	{
-		llifstream in_file;
-		in_file.open(filename.c_str());
-
-		LLSD uuids_data;
-		if (in_file.is_open())
-		{
-			LLSDSerialize::fromXML(uuids_data, in_file);
-			in_file.close();
-			for (LLSD::array_iterator i = uuids_data.beginArray(); i != uuids_data.endArray(); ++i)
-			{
-				mNewItemsIDs.insert((*i).asUUID());
-			}
-		}
-	}
-}
-
-void LLInboxNewItemsStorage::removeItem(const LLUUID& id)
-{
-    mNewItemsIDs.erase(id);
-
-    //notify inbox panels
-    for (auto inbox : mInboxPanels)
-    {
-        if(inbox)
-        {
-            inbox->onRemoveItemFreshness(id);
-        }
-    }
-}
-// eof
+/**

+ * @file llpanelmarketplaceinboxinventory.cpp

+ * @brief LLInboxInventoryPanel  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 "llpanelmarketplaceinboxinventory.h"

+

+#include "llfolderview.h"

+#include "llfolderviewitem.h"

+#include "llfolderviewmodel.h"

+#include "llinventorybridge.h"

+#include "llinventoryfunctions.h"

+#include "llpanellandmarks.h"

+#include "llplacesinventorybridge.h"

+#include "llviewerfoldertype.h"

+#include "llsdserialize.h"

+

+

+#define DEBUGGING_FRESHNESS 0

+

+const LLColor4U DEFAULT_WHITE(255, 255, 255);

+

+const std::string NEW_INBOX_FILENAME("inbox_new_items.xml");

+

+//

+// statics

+//

+

+static LLDefaultChildRegistry::Register<LLInboxInventoryPanel> r1("inbox_inventory_panel");

+static LLDefaultChildRegistry::Register<LLInboxFolderViewFolder> r2("inbox_folder_view_folder");

+static LLDefaultChildRegistry::Register<LLInboxFolderViewItem> r3("inbox_folder_view_item");

+

+

+//

+// LLInboxInventoryPanel Implementation

+//

+

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

+:   LLInventoryPanel(p)

+{

+    LLInboxNewItemsStorage::getInstance()->load();

+    LLInboxNewItemsStorage::getInstance()->addInboxPanel(this);

+}

+

+LLInboxInventoryPanel::~LLInboxInventoryPanel()

+{

+    LLInboxNewItemsStorage::getInstance()->removeInboxPanel(this);

+}

+

+void LLInboxInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)

+{

+    LLInventoryPanel::initFromParams(params);

+    getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() | (1ULL << LLFolderType::FT_INBOX));

+}

+

+LLFolderViewFolder * LLInboxInventoryPanel::createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop)

+{

+    LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);

+

+    LLInboxFolderViewFolder::Params params;

+

+    params.name = bridge->getDisplayName();

+    params.root = mFolderRoot.get();

+    params.listener = bridge;

+    params.tool_tip = params.name;

+    params.font_color = item_color;

+    params.font_highlight_color = item_color;

+    params.allow_drop = allow_drop;

+

+    return LLUICtrlFactory::create<LLInboxFolderViewFolder>(params);

+}

+

+LLFolderViewItem * LLInboxInventoryPanel::createFolderViewItem(LLInvFVBridge * bridge)

+{

+    LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);

+

+    LLInboxFolderViewItem::Params params;

+

+    params.name = bridge->getDisplayName();

+    params.creation_date = bridge->getCreationDate();

+    params.root = mFolderRoot.get();

+    params.listener = bridge;

+    params.rect = LLRect (0, 0, 0, 0);

+    params.tool_tip = params.name;

+    params.font_color = item_color;

+    params.font_highlight_color = item_color;

+

+    return LLUICtrlFactory::create<LLInboxFolderViewItem>(params);

+}

+

+void LLInboxInventoryPanel::onRemoveItemFreshness(const LLUUID& item_id)

+{

+    LLInboxFolderViewFolder* inbox_folder_view = dynamic_cast<LLInboxFolderViewFolder*>(getFolderByID(item_id));

+    if(inbox_folder_view)

+    {

+        inbox_folder_view->setFresh(false);

+    }

+

+    LLInboxFolderViewItem* inbox_item_view = dynamic_cast<LLInboxFolderViewItem*>(getItemByID(item_id));

+    if(inbox_item_view)

+    {

+        inbox_item_view->setFresh(false);

+    }

+}

+

+//

+// LLInboxFolderViewFolder Implementation

+//

+

+LLInboxFolderViewFolder::LLInboxFolderViewFolder(const Params& p)

+:   LLFolderViewFolder(p),

+    LLBadgeOwner(getHandle()),

+    mFresh(false)

+{

+    initBadgeParams(p.new_badge());

+}

+

+void LLInboxFolderViewFolder::addItem(LLFolderViewItem* item)

+{

+    LLFolderViewFolder::addItem(item);

+

+    if(item)

+    {

+        LLInvFVBridge* itemBridge = static_cast<LLInvFVBridge*>(item->getViewModelItem());

+        LLFolderBridge * bridge = static_cast<LLFolderBridge *>(getViewModelItem());

+        bridge->updateHierarchyCreationDate(itemBridge->getCreationDate());

+    }

+

+    // Compute freshness if our parent is the root folder for the inbox

+    if ((mParentFolder == mRoot) && !mFresh)

+    {

+        computeFreshness();

+    }

+}

+

+// virtual

+void LLInboxFolderViewFolder::draw()

+{

+    if (!hasBadgeHolderParent())

+    {

+        addBadgeToParentHolder();

+        setDrawBadgeAtTop(true);

+    }

+

+    setBadgeVisibility(mFresh);

+

+    LLFolderViewFolder::draw();

+

+    if (mFresh)

+    {

+        reshapeBadge(getRect());

+    }

+

+}

+

+bool LLInboxFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )

+{

+    deFreshify();

+    return LLFolderViewFolder::handleMouseDown(x, y, mask);

+}

+

+bool LLInboxFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )

+{

+    deFreshify();

+    return LLFolderViewFolder::handleDoubleClick(x, y, mask);

+}

+

+void LLInboxFolderViewFolder::selectItem()

+{

+    deFreshify();

+    LLFolderViewFolder::selectItem();

+}

+

+void LLInboxFolderViewFolder::computeFreshness()

+{

+    LLFolderViewModelItemInventory* view_model = static_cast<LLFolderViewModelItemInventory*>(getViewModelItem());

+    const U32 last_expansion_utc = gSavedPerAccountSettings.getU32("LastInventoryInboxActivity");

+

+    if (last_expansion_utc > 0)

+    {

+        mFresh = (view_model->getCreationDate() > last_expansion_utc) || LLInboxNewItemsStorage::getInstance()->isItemFresh(view_model->getUUID());

+

+#if DEBUGGING_FRESHNESS

+        if (mFresh)

+        {

+            LL_INFOS() << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion_utc << LL_ENDL;

+        }

+#endif

+    }

+    else

+    {

+        mFresh = true;

+    }

+

+    if (mFresh)

+    {

+        LLInboxNewItemsStorage::getInstance()->addFreshItem(view_model->getUUID());

+    }

+}

+

+void LLInboxFolderViewFolder::deFreshify()

+{

+    mFresh = false;

+

+    gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());

+    LLInboxNewItemsStorage::getInstance()->removeItem(static_cast<LLFolderViewModelItemInventory*>(getViewModelItem())->getUUID());

+}

+

+//

+// LLInboxFolderViewItem Implementation

+//

+

+LLInboxFolderViewItem::LLInboxFolderViewItem(const Params& p)

+    : LLFolderViewItem(p)

+    , LLBadgeOwner(getHandle())

+    , mFresh(false)

+{

+    initBadgeParams(p.new_badge());

+}

+

+void LLInboxFolderViewItem::addToFolder(LLFolderViewFolder* folder)

+{

+    LLFolderViewItem::addToFolder(folder);

+

+    // Compute freshness if our parent is the root folder for the inbox

+    if (mParentFolder == mRoot)

+    {

+        computeFreshness();

+    }

+}

+

+bool LLInboxFolderViewItem::handleDoubleClick(S32 x, S32 y, MASK mask)

+{

+    deFreshify();

+

+    return LLFolderViewItem::handleDoubleClick(x, y, mask);

+}

+

+// virtual

+void LLInboxFolderViewItem::draw()

+{

+    if (!hasBadgeHolderParent())

+    {

+        addBadgeToParentHolder();

+    }

+

+    setBadgeVisibility(mFresh);

+

+    LLFolderViewItem::draw();

+}

+

+void LLInboxFolderViewItem::selectItem()

+{

+    deFreshify();

+

+    LLFolderViewItem::selectItem();

+}

+

+void LLInboxFolderViewItem::computeFreshness()

+{

+    const U32 last_expansion_utc = gSavedPerAccountSettings.getU32("LastInventoryInboxActivity");

+

+    if (last_expansion_utc > 0)

+    {

+        mFresh = (static_cast<LLFolderViewModelItemInventory*>(getViewModelItem())->getCreationDate() > last_expansion_utc);

+

+#if DEBUGGING_FRESHNESS

+        if (mFresh)

+        {

+            LL_INFOS() << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion_utc << LL_ENDL;

+        }

+#endif

+    }

+    else

+    {

+        mFresh = true;

+    }

+}

+

+void LLInboxFolderViewItem::deFreshify()

+{

+    mFresh = false;

+

+    gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());

+}

+

+LLInboxNewItemsStorage::LLInboxNewItemsStorage()

+{

+}

+

+// static

+void LLInboxNewItemsStorage::destroyClass()

+{

+    LLInboxNewItemsStorage::getInstance()->saveNewItemsIds();

+}

+

+void LLInboxNewItemsStorage::saveNewItemsIds()

+{

+    std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, NEW_INBOX_FILENAME);

+    if (!filename.empty())

+    {

+        LLSD uuids_data;

+        for (std::set<LLUUID>::const_iterator it = mNewItemsIDs.begin(); it != mNewItemsIDs.end(); it++)

+        {

+            uuids_data.append((*it));

+        }

+

+        llofstream file;

+        file.open(filename.c_str());

+        if ( file.is_open() )

+        {

+            LLSDSerialize::toPrettyXML(uuids_data, file);

+            file.close();

+        }

+    }

+}

+

+void LLInboxNewItemsStorage::load()

+{

+    std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, NEW_INBOX_FILENAME);

+    if (!filename.empty())

+    {

+        llifstream in_file;

+        in_file.open(filename.c_str());

+

+        LLSD uuids_data;

+        if (in_file.is_open())

+        {

+            LLSDSerialize::fromXML(uuids_data, in_file);

+            in_file.close();

+            for (LLSD::array_iterator i = uuids_data.beginArray(); i != uuids_data.endArray(); ++i)

+            {

+                mNewItemsIDs.insert((*i).asUUID());

+            }

+        }

+    }

+}

+

+void LLInboxNewItemsStorage::removeItem(const LLUUID& id)

+{

+    mNewItemsIDs.erase(id);

+

+    //notify inbox panels

+    for (auto inbox : mInboxPanels)

+    {

+        if(inbox)

+        {

+            inbox->onRemoveItemFreshness(id);

+        }

+    }

+}

+// eof