Removed old RLV code. Plugged holes with RLVa.

2011-08-14 02:33:57 -05:00
parent 88df625096
commit 1c38d016d5
8 changed files with 60 additions and 108 deletions
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4119,13 +4119,10 @@ void LLObjectBridge::openItem()
 	}
 	if (avatar->isWearingAttachment(mUUID))
 	{
-#ifdef LL_RRINTERFACE_H //MK
-		if (gRRenabled && !gAgent.mRRInterface.canDetach(avatar->getWornAttachment(mUUID)))
-		{
-			return;
-		}
-#endif //mk
-		performAction(NULL, NULL, "detach");
+// [RLVa:KB]
+		if ( !(rlv_handler_t::isEnabled()) || (gRlvAttachmentLocks.canDetach(getItem())))
+			performAction(NULL, NULL, "detach");
+// [/RLVa:KB]		
 	}
 	else
 	{