From 1aa0416aef379bb3ad1012441588b6d7fab81b40 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Fri, 13 Mar 2009 21:28:40 +0000 Subject: svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done. --- indra/newview/llinventorybridge.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'indra/newview/llinventorybridge.cpp') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 0aa406dff1..69a403e388 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1846,15 +1846,23 @@ void LLFolderBridge::folderOptionsMenu() LLInventoryModel* model = mInventoryPanel->getModel(); if(!model) return; + + const LLInventoryCategory* category = model->getCategory(mUUID); + bool is_default_folder = category && + (LLAssetType::AT_NONE != category->getPreferredType()); // calling card related functionality for folders. - LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD); - if (mCallingCards || checkFolderForContentsOfType(model, is_callingcard)) + // Only enable calling-card related options for non-default folders. + if (!is_default_folder) { - mItems.push_back(std::string("Calling Card Separator")); - mItems.push_back(std::string("Conference Chat Folder")); - mItems.push_back(std::string("IM All Contacts In Folder")); + LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD); + if (mCallingCards || checkFolderForContentsOfType(model, is_callingcard)) + { + mItems.push_back(std::string("Calling Card Separator")); + mItems.push_back(std::string("Conference Chat Folder")); + mItems.push_back(std::string("IM All Contacts In Folder")); + } } // wearables related functionality for folders. @@ -1871,8 +1879,7 @@ void LLFolderBridge::folderOptionsMenu() mItems.push_back(std::string("Folder Wearables Separator")); // Only enable add/replace outfit for non-default folders. - const LLInventoryCategory* category = model->getCategory(mUUID); - if (!category || (LLAssetType::AT_NONE == category->getPreferredType())) + if (!is_default_folder) { mItems.push_back(std::string("Add To Outfit")); mItems.push_back(std::string("Replace Outfit")); -- cgit v1.2.3