diff options
| author | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
| commit | a1041a6fa17368e13d610df9d5eb23e307654815 (patch) | |
| tree | 5f8c22e1bbdeb727600c31ff60f908b785c2faae /linden/indra/newview/llinventorybridge.cpp | |
| parent | Moved "Show HUD Attachments" back to View, restored shortcut. (diff) | |
| parent | Fixed region names not showing up on regions with zero avatars (diff) | |
| download | meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.zip meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.gz meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.bz2 meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to 'linden/indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 19a5ade..618c4f9 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
| @@ -4241,7 +4241,15 @@ void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove) | |||
| 4241 | { | 4241 | { |
| 4242 | if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) ) | 4242 | if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) ) |
| 4243 | { | 4243 | { |
| 4244 | items.put(item); | 4244 | // items.put(item); |
| 4245 | // [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c | ||
| 4246 | LLViewerJointAttachment* pAttachPt = NULL; | ||
| 4247 | if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) || | ||
| 4248 | (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt->getObject()))) ) | ||
| 4249 | { | ||
| 4250 | items.put(item); | ||
| 4251 | } | ||
| 4252 | // [/RLVa:KB] | ||
| 4245 | } | 4253 | } |
| 4246 | else if ( (item->isComplete()) ) | 4254 | else if ( (item->isComplete()) ) |
| 4247 | { | 4255 | { |