Merged almost-final version of Imprudence 1.2 into 1.3

1 files changed, 1 insertions, 12 deletions

diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index d7fdece..fc483dd 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -208,18 +208,7 @@ void LLFloaterOpenObject::onClickMoveToInventory(void* data)
 void LLFloaterOpenObject::onClickMoveAndWear(void* data)
 {
         LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Deprecated: RLVa-0.2.2a
-        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
-        {
-                // TODO-RLVa: once we have "Add to Outfit" and "Replace Outfit" working we don't need this anymore
-                self->moveToInventory(false);
-        }
-        else
-        {
-                self->moveToInventory(true);
-        }
-// [/RLVa:KB]
-//      self->moveToInventory(true);
+        self->moveToInventory(true);
         self->close();
 }