summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-08-28 21:19:20 +0000
committerJosh Bell <josh@lindenlab.com>2007-08-28 21:19:20 +0000
commit6d2c503f6132ed9cdb43f5e0e4e977eff31618a4 (patch)
treeafc1c311c779cef55b0950ebf07f56721373d597 /indra/newview/llinventorybridge.cpp
parentce0a5fe14590b8d675b885fccd5f79d7ea17a302 (diff)
svn merge -r 68474:68690 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Sync up fixes, version numbers, and release notes applied to the viewer RC branch.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 073d6cc088..c6f94841cb 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4229,7 +4229,8 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
LLViewerInventoryItem* item = getItem();
if( !no_open && item )
{
- no_open = (item->getType() == LLAssetType::AT_CLOTHING);
+ no_open = (item->getType() == LLAssetType::AT_CLOTHING) ||
+ (item->getType() == LLAssetType::AT_BODYPART);
}
if (!no_open)