diff options
author | McCabe Maxsted | 2009-10-06 22:12:05 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-06 22:12:05 -0700 |
commit | 23d5c59f6833156ee0714ecfba8194dd8708c730 (patch) | |
tree | 4ab05bf6af6da511c6d5072d42c2cb70570c5a11 /linden/indra/newview/llinventorybridge.cpp | |
parent | Tiny improvement to radar code (diff) | |
download | meta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.zip meta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.tar.gz meta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.tar.bz2 meta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.tar.xz |
Applied RLVa-1.0.2c_20091005_Imprudence-1.2.0-diff.patch
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 618c4f9..0d5625c 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
@@ -3505,7 +3505,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) | |||
3505 | if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getEnableWear()) && (gRlvHandler.hasLockedAttachment()) ) | 3505 | if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getEnableWear()) && (gRlvHandler.hasLockedAttachment()) ) |
3506 | { | 3506 | { |
3507 | LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(item, true); | 3507 | LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(item, true); |
3508 | if ( (!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt->getObject())) ) | 3508 | if ( (!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt)) ) |
3509 | disabled_items.push_back(std::string("Object Wear")); | 3509 | disabled_items.push_back(std::string("Object Wear")); |
3510 | } | 3510 | } |
3511 | // [/RLVa:KB] | 3511 | // [/RLVa:KB] |
@@ -4057,7 +4057,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata ) | |||
4057 | for (S32 idxObj = obj_item_array.count() - 1; idxObj >= 0; idxObj--) | 4057 | for (S32 idxObj = obj_item_array.count() - 1; idxObj >= 0; idxObj--) |
4058 | { | 4058 | { |
4059 | LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(obj_item_array.get(idxObj).get(), true); | 4059 | LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(obj_item_array.get(idxObj).get(), true); |
4060 | if ( ((!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt->getObject()))) ) | 4060 | if ( ((!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt))) ) |
4061 | obj_item_array.remove(idxObj); | 4061 | obj_item_array.remove(idxObj); |
4062 | } | 4062 | } |
4063 | obj_count = obj_item_array.count(); | 4063 | obj_count = obj_item_array.count(); |
@@ -4245,7 +4245,7 @@ void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove) | |||
4245 | // [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c | 4245 | // [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c |
4246 | LLViewerJointAttachment* pAttachPt = NULL; | 4246 | LLViewerJointAttachment* pAttachPt = NULL; |
4247 | if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) || | 4247 | if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) || |
4248 | (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt->getObject()))) ) | 4248 | (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt))) ) |
4249 | { | 4249 | { |
4250 | items.put(item); | 4250 | items.put(item); |
4251 | } | 4251 | } |