Merged in jacek/next

1 files changed, 10 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 3b23bb9..2240d44 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2993,6 +2993,16 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                                                 {
                                                         moveable_object_selected = TRUE;
                                                         this_object_movable = TRUE;
+
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.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() == object->getRootEdit()) )
+                                                                        moveable_object_selected = this_object_movable = FALSE;
+                                                        }
+// [/RLVa:KB]
                                                 }
                                                 all_selected_objects_move = all_selected_objects_move && this_object_movable;
                                                 all_selected_objects_modify = all_selected_objects_modify && object->permModify();