Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ManagedMarketplace

Browse Source 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltooldraganddrop.h
This commit is contained in:
Lirusaito
2019-02-28 23:32:37 -05:00
parent c7ca3d9261 2b8c630922
commit fb39f2d511
217 changed files with 7047 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llinventorybridge.cpp
View File

@@ -42,6 +42,7 @@
#include "llattachmentsmgr.h"
#include "llavataractions.h"
#include "llcallingcard.h"
#include "llfavoritesbar.h" // management of favorites folder
#include "llfirstuse.h"
#include "llfloatercustomize.h"
#include "llfloatermarketplacelistings.h"
@@ -711,7 +712,7 @@ void hide_context_entries(LLMenuGL& menu,
// between two separators).
if (found)
{
const bool is_entry_separator = (dynamic_cast<LLMenuItemSeparatorGL *>(menu_item) != NULL);
const bool is_entry_separator = !branchp && (dynamic_cast<LLMenuItemSeparatorGL *>(menu_item) != NULL);
found = !(is_entry_separator && is_previous_entry_separator);
is_previous_entry_separator = is_entry_separator;
}
@@ -1480,6 +1481,9 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
//LL_WARNS() << LLAssetType::lookup(asset_type) << " asset type is unhandled for uuid " << uuid << LL_ENDL;
break;
case LLAssetType::AT_SETTINGS:
break;
default:
LL_INFOS() << "Unhandled asset type (llassetstorage.h): "
<< (S32)asset_type << " (" << LLAssetType::lookup(asset_type) << ")" << LL_ENDL;
@@ -4551,7 +4555,7 @@ void LLFolderBridge::dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_c
}
else
{
LLPointer<LLInventoryCallback> cb = NULL;
LLPointer<LLInventoryCallback> cb = nullptr;
link_inventory_object(mUUID, LLConstPointer<LLInventoryObject>(inv_item), cb);
}
}
@@ -4699,7 +4703,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
{
accept = can_move_to_outfit(inv_item, move_is_into_current_outfit);
}
else if (user_confirm && (move_is_into_favorites || move_is_into_landmarks))
else if (user_confirm && (/*move_is_into_favorites ||*/ move_is_into_landmarks))
{
accept = can_move_to_landmarks(inv_item);
}
@@ -4764,7 +4768,6 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
// Destination folder logic
//
/* Singu TODO: Favorites
// REORDER
// (only reorder the item in Favorites folder)
if ((mUUID == inv_item->getParentUUID()) && move_is_into_favorites)
@@ -4774,13 +4777,13 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
{
LLUUID srcItemId = inv_item->getUUID();
LLUUID destItemId = itemp->getListener()->getUUID();
gInventory.rearrangeFavoriteLandmarks(srcItemId, destItemId);
LLFavoritesOrderStorage::instance().rearrangeFavoriteLandmarks(srcItemId, destItemId);
}
}
// FAVORITES folder
// (copy the item)
else */if (move_is_into_favorites)
else if (move_is_into_favorites)
{
dropToFavorites(inv_item);
}
@@ -4884,7 +4887,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
}
// Don't allow to move a single item to Favorites or Landmarks
// if it is not a landmark or a link to a landmark.
else if ((move_is_into_favorites || move_is_into_landmarks)
else if ((/*move_is_into_favorites ||*/ move_is_into_landmarks)
&& !can_move_to_landmarks(inv_item))
{
accept = FALSE;
@@ -4955,7 +4958,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
}
// Don't allow to move a single item to Favorites or Landmarks
// if it is not a landmark or a link to a landmark.
else if (move_is_into_favorites || move_is_into_landmarks)
else if (/*move_is_into_favorites ||*/ move_is_into_landmarks)
{
accept = can_move_to_landmarks(inv_item);
}