Merged with RLVa-1.3.1b tip

2011-06-11 20:09:02 +02:00 · 2011-06-11 20:09:02 +02:00 · a6de31d09b
parent 740ff21507 554977066d
commit a6de31d09b
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@ -3238,7 +3238,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 			}
 			if (is_movable)
 			{
-				is_movable = (RlvFolderLocks::instance().hasLockedFolder(RLV_LOCK_ANY)) && 
+				is_movable = (!RlvFolderLocks::instance().hasLockedFolder(RLV_LOCK_ANY)) || 
 					(RlvFolderLocks::instance().canMoveItem(inv_item->getUUID(), mUUID));
 			}
 		}