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

Double check vmm merge against alchemy. (sync)

Browse Source
This commit is contained in:
Inusaito Sayori
2015-08-01 16:55:33 -04:00
committed by Lirusaito
parent fd4155f4b6
commit 7c1af50bda
17 changed files with 472 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventorybridge.cpp
View File

@@ -3877,8 +3877,6 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
const bool is_cof(isCOFFolder());
if (!is_cof && cat && (cat->getPreferredType() != LLFolderType::FT_OUTFIT))
{
LLInventoryPanel* panel = mInventoryPanel.get();
if(panel && !panel->getFilterWorn())
if (!isInboxFolder() && !isOutboxFolder()) // don't allow creation in inbox or outbox
{
{
@@ -7404,7 +7402,7 @@ void LLWearableBridgeAction::wearOnAvatar()
LLViewerInventoryItem* item = getItem();
if(item)
{
if (get_is_item_worn(item))
if (get_is_item_worn(item->getUUID()))
{
LLAppearanceMgr::instance().removeItemFromAvatar(item->getUUID());
}