From 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Sep 2009 17:52:41 -0700
Subject: Merged in jacek/next

---
 linden/indra/newview/llmaniptranslate.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llmaniptranslate.cpp')

diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index fd02be6..fa66b05 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -463,8 +463,15 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 			if (mask == MASK_COPY)
 			{
 				// ...we're trying to make a copy
-				LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
-				mCopyMadeThisDrag = TRUE;
+//				LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
+//				mCopyMadeThisDrag = TRUE;
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+				if (!gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+				{
+					LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
+					mCopyMadeThisDrag = TRUE;
+				}
+// [/RLVa:KB]
 
 				// When we make the copy, we don't want to do any other processing.
 				// If so, the object will also be moved, and the copy will be offset.
-- 
cgit v1.1