Merged almost-final version of Imprudence 1.2 into 1.3

1 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 4b8a151..082b95c 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -2001,8 +2001,8 @@ void LLLiveLSLEditor::onRunningCheckboxClicked( LLUICtrl*, void* userdata )
         LLCheckBoxCtrl* runningCheckbox = self->getChild<LLCheckBoxCtrl>("running");
         BOOL running =  runningCheckbox->get();
         //self->mRunningCheckbox->get();
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
         {
                 return;
         }
@@ -2032,8 +2032,8 @@ void LLLiveLSLEditor::onReset(void *userdata)
         LLLiveLSLEditor* self = (LLLiveLSLEditor*) userdata;
 
         LLViewerObject* object = gObjectList.findObject( self->mObjectID );
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
         {
                 return;
         }
@@ -2460,8 +2460,8 @@ void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
 {
         LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
 
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(gObjectList.findObject(self->mObjectID))) )
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(gObjectList.findObject(self->mObjectID), RLV_LOCK_REMOVE)) )
         {
                 return;
         }