diff options
author | McCabe Maxsted | 2009-11-07 16:21:26 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-11-07 16:21:26 -0700 |
commit | 5a376379b6eeca8ecb709d5415ac130a1a99b4be (patch) | |
tree | 08da468b4bbf8025cf9da3cc2f2f12ff45d6ef00 /linden/indra/newview/llfloateropenobject.cpp | |
parent | Changed default UIScaleFactor to 1.002 as a workaround to some font rendering... (diff) | |
download | meta-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/llfloateropenobject.cpp')
-rw-r--r-- | linden/indra/newview/llfloateropenobject.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp index fd4f9c6..a83b0c9 100644 --- a/linden/indra/newview/llfloateropenobject.cpp +++ b/linden/indra/newview/llfloateropenobject.cpp | |||
@@ -207,18 +207,7 @@ void LLFloaterOpenObject::onClickMoveToInventory(void* data) | |||
207 | void LLFloaterOpenObject::onClickMoveAndWear(void* data) | 207 | void LLFloaterOpenObject::onClickMoveAndWear(void* data) |
208 | { | 208 | { |
209 | LLFloaterOpenObject* self = (LLFloaterOpenObject*)data; | 209 | LLFloaterOpenObject* self = (LLFloaterOpenObject*)data; |
210 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Deprecated: RLVa-0.2.2a | 210 | self->moveToInventory(true); |
211 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) ) | ||
212 | { | ||
213 | // TODO-RLVa: once we have "Add to Outfit" and "Replace Outfit" working we don't need this anymore | ||
214 | self->moveToInventory(false); | ||
215 | } | ||
216 | else | ||
217 | { | ||
218 | self->moveToInventory(true); | ||
219 | } | ||
220 | // [/RLVa:KB] | ||
221 | // self->moveToInventory(true); | ||
222 | self->close(); | 211 | self->close(); |
223 | } | 212 | } |
224 | 213 | ||