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/llpanelobject.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 5c70590..dd71a0e 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -75,6 +75,10 @@
 
 #include "lldrawpool.h"
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 //
 // Constants
 //
@@ -385,6 +389,15 @@ void LLPanelObject::getState( )
 		enable_rotate = FALSE;
 	}
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+	if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) )
+	{
+		LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+		if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == objectp->getRootEdit()) )
+			enable_move = enable_scale = enable_rotate = FALSE;
+	}
+// [/RLVa:KB]
+
 	LLVector3 vec;
 	if (enable_move)
 	{
-- 
cgit v1.1


From 4cdef469977e8907b06e1fafb4d7c54a6eff93f9 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 18 Sep 2009 08:52:24 -0700
Subject: Dynamically change max prim size depending upon LL/OpenSim grid
 (added setting for opensim detection: LoggedIntoOpenSim). OpenSim max is 128m

---
 linden/indra/newview/llpanelobject.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index dd71a0e..9dcf410 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -631,6 +631,10 @@ void LLPanelObject::getState( )
 	}
 	else
 	{
+		mCtrlScaleX->setMaxValue(LLManipScale::getMaxPrimSize());
+		mCtrlScaleY->setMaxValue(LLManipScale::getMaxPrimSize());
+		mCtrlScaleZ->setMaxValue(LLManipScale::getMaxPrimSize());
+
 		// Only allowed to change these parameters for objects
 		// that you have permissions on AND are not attachments.
 		enabled = root_objectp->permModify();
-- 
cgit v1.1