summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbulkpermission.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-05 11:41:07 +0800
committerangela <angela@lindenlab.com>2009-11-05 11:41:07 +0800
commit95738da3d82b92e82744dbc6b377a3feae2e6441 (patch)
treecf1678c617ea644a14d20a40fbfc58f156fd9591 /indra/newview/llfloaterbulkpermission.cpp
parent35c7c7a9b29ef4462ea969b393c25b59813ef169 (diff)
parentaf401ac6dc463db477210b0ff100014fbeb50a9a (diff)
merge
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.cpp')
-rw-r--r--indra/newview/llfloaterbulkpermission.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index 7cb8987879..538b44c056 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -264,7 +264,6 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, Invent
( asstype == LLAssetType::AT_BODYPART && gSavedSettings.getBOOL("BulkChangeIncludeBodyParts" )) ||
( asstype == LLAssetType::AT_CLOTHING && gSavedSettings.getBOOL("BulkChangeIncludeClothing" )) ||
( asstype == LLAssetType::AT_GESTURE && gSavedSettings.getBOOL("BulkChangeIncludeGestures" )) ||
- ( asstype == LLAssetType::AT_FAVORITE && gSavedSettings.getBOOL("BulkChangeIncludeFavourite" )) ||
( asstype == LLAssetType::AT_NOTECARD && gSavedSettings.getBOOL("BulkChangeIncludeNotecards" )) ||
( asstype == LLAssetType::AT_OBJECT && gSavedSettings.getBOOL("BulkChangeIncludeObjects" )) ||
( asstype == LLAssetType::AT_LSL_TEXT && gSavedSettings.getBOOL("BulkChangeIncludeScripts" )) ||