aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-07 16:21:26 -0700
committerMcCabe Maxsted2009-11-07 16:21:26 -0700
commit5a376379b6eeca8ecb709d5415ac130a1a99b4be (patch)
tree08da468b4bbf8025cf9da3cc2f2f12ff45d6ef00 /linden/indra/newview/llagent.cpp
parentChanged default UIScaleFactor to 1.002 as a workaround to some font rendering... (diff)
downloadmeta-impy-5a376379b6eeca8ecb709d5415ac130a1a99b4be.zip
meta-impy-5a376379b6eeca8ecb709d5415ac130a1a99b4be.tar.gz
meta-impy-5a376379b6eeca8ecb709d5415ac130a1a99b4be.tar.bz2
meta-impy-5a376379b6eeca8ecb709d5415ac130a1a99b4be.tar.xz
Applied RLVa-1.0.5e_20091107_Imprudence-1.2.0-diff.patch
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r--linden/indra/newview/llagent.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 8b118e0..a0ab4ab 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7761,7 +7761,7 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
7761 return; 7761 return;
7762 } 7762 }
7763 7763
7764// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.0c 7764// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
7765 // NOTE-RLVa: This function is called from inside RlvHandler as well, hence the rather heavy modifications 7765 // NOTE-RLVa: This function is called from inside RlvHandler as well, hence the rather heavy modifications
7766 std::list<U32> rlvAttachments; 7766 std::list<U32> rlvAttachments;
7767 // TODO-RLVa: Once we have the improved "removeWearable" logic implemented we can just get rid of the whole "rlvCompFolders" hassle 7767 // TODO-RLVa: Once we have the improved "removeWearable" logic implemented we can just get rid of the whole "rlvCompFolders" hassle
@@ -7779,7 +7779,7 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
7779 { 7779 {
7780 if (rlv_handler_t::isEnabled()) 7780 if (rlv_handler_t::isEnabled())
7781 { 7781 {
7782 if (!gRlvHandler.isDetachable(curiter->first)) 7782 if (gRlvHandler.isLockedAttachment(curiter->first, RLV_LOCK_REMOVE))
7783 continue; 7783 continue;
7784 7784
7785 // Check if we're being called in response to an RLV command (that would be @detach=force) 7785 // Check if we're being called in response to an RLV command (that would be @detach=force)