livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-14517: "Move to Default Folder" can be used to move items out of protected folders

Ansariel 2014-09-02 09:07:55 +02:00
parent 8a5116c9fa
commit ef4a84dfec
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llinventorybridge.cpp
View File

@ -678,7 +678,7 @@ void LLInvFVBridge::checkMoveToDefaultFolder(menuentry_vec_t& items, menuentry_v
{
const LLInventoryObject* obj = getInventoryObject();
if (isAgentInventory() && !isOutboxFolder() && obj &&
if (isAgentInventory() && !isOutboxFolder() && !isProtectedFolder(true) && obj &&
obj->getActualType() != LLAssetType::AT_CATEGORY &&
obj->getActualType() != LLAssetType::AT_LINK_FOLDER &&
obj->getActualType() != LLAssetType::AT_LINK
@ -1085,19 +1085,27 @@ BOOL LLInvFVBridge::isCOFFolder() const
}
// <FS:TT> Client LSL Bridge (also for #AO)
BOOL LLInvFVBridge::isProtectedFolder() const
BOOL LLInvFVBridge::isProtectedFolder(bool ignore_setting /*= false*/) const
{
const LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
if (!model)
{
return FALSE;
}
if ((mUUID == FSLSLBridge::instance().getBridgeFolder()
|| model->isObjectDescendentOf(mUUID, FSLSLBridge::instance().getBridgeFolder()))
&& gSavedPerAccountSettings.getBOOL("ProtectBridgeFolder"))
&& (gSavedPerAccountSettings.getBOOL("ProtectBridgeFolder") || ignore_setting))
{
return TRUE;
}
if ((mUUID == AOEngine::instance().getAOFolder()
|| model->isObjectDescendentOf(mUUID, AOEngine::instance().getAOFolder()))
&& gSavedPerAccountSettings.getBOOL("ProtectAOFolders"))
&& (gSavedPerAccountSettings.getBOOL("ProtectAOFolders") || ignore_setting))
{
return TRUE;
}
return FALSE;
}

2
indra/newview/llinventorybridge.h
View File

@ -165,7 +165,7 @@ protected:
// [/SL:KB]
BOOL isCOFFolder() const; // true if COF or descendent of
// <FS:TT> Client LSL Bridge
BOOL isProtectedFolder() const;
BOOL isProtectedFolder(bool ignore_setting = false) const;
// </FS:TT>
BOOL isInboxFolder() const; // true if COF or descendent of marketplace inbox
BOOL isOutboxFolder() const; // true if COF or descendent of marketplace outbox