Merged almost-final version of Imprudence 1.2 into 1.3

1 files changed, 113 insertions, 50 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b129bff..cebd6fd 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2190,8 +2190,9 @@ class LLSelfEnableRemoveAllAttachments : public view_listener_t
                                 LLVOAvatar::attachment_map_t::iterator curiter = iter++;
                                 LLViewerJointAttachment* attachment = curiter->second;
 //                              if (attachment->getObject())
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0c
-                                if ( (attachment->getObject()) && ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isDetachable(curiter->first)) ) )
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+                                if ( (attachment->getObject()) && 
+                                         ((!rlv_handler_t::isEnabled()) || (!gRlvHandler.isLockedAttachment(curiter->first, RLV_LOCK_REMOVE))) )
 // [/RLVa:KB]
                                 {
                                         new_value = true;
@@ -2428,26 +2429,45 @@ class LLObjectImportUpload : public view_listener_t
         }
 };
 
-bool handle_go_to()
+bool handle_go_to_confirm()
 {
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-        if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) )
+        if ( (rlv_handler_t::isEnabled()) && (gAgent.forwardGrabbed()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
         {
                 return true;
         }
 // [/RLVa:KB]
 
-        if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+        std::string action = gSavedSettings.getString("GoAction");
+        LLStringUtil::toLower(action);
+
+        if (action == "teleport")
         {
                 gViewerWindow->alertXml("ConfirmDoubleClickTP", handle_go_to_callback, (void*)LLToolPie::getInstance());
         }
-        else if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+        else if (action == "autopilot")
         {
                 gViewerWindow->alertXml("ConfirmAutoPilot", handle_go_to_callback, (void*)LLToolPie::getInstance());
         }
         return true;
 }
 
+
+bool handle_go_to()
+{
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+        if ( (rlv_handler_t::isEnabled()) && (gAgent.forwardGrabbed()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
+        {
+                return true;
+        }
+ // [/RLVa:KB]
+
+        handle_go_to_callback( 0, (void*)LLToolPie::getInstance() );
+
+        return true;
+}
+
+
 //static
 void handle_go_to_callback(S32 option, void *userdata)
 {
@@ -2459,13 +2479,17 @@ void handle_go_to_callback(S32 option, void *userdata)
                 std::vector<std::string> strings;
                 std::string val;
                 LLVector3d pos = pie->getPick().mPosGlobal;
-                if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+
+                std::string action = gSavedSettings.getString("GoAction");
+                LLStringUtil::toLower(action);
+
+                if (action == "teleport")
                 {
                         LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
                         gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
                         gAgent.teleportViaLocation(pos + hips_offset);
                 }
-                else
+                else if (action == "autopilot")
                 {
                         // JAMESDEBUG try simulator autopilot
                         std::vector<std::string> strings;
@@ -2493,6 +2517,10 @@ void handle_go_to_callback(S32 option, void *userdata)
                         // Could be first use
                         LLFirstUse::useGoTo();
                 }
+                else
+                {
+                        llwarns << "Unhandled GoAction setting: " << action << llendl;
+                }
         }
 }
 
@@ -4710,8 +4738,8 @@ class LLToolsReleaseKeys : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                 {
                         return true;
                 }
@@ -4727,9 +4755,9 @@ class LLToolsEnableReleaseKeys : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                 gMenuHolder->findControl(userdata["control"].asString())->setValue( 
-                                gAgent.anyControlGrabbed() && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment() ) ) );
+                        gAgent.anyControlGrabbed() && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE) ) ) );
 // [/RLVa:KB]
                 //gMenuHolder->findControl(userdata["control"].asString())->setValue( gAgent.anyControlGrabbed() );
                 return true;
@@ -6100,11 +6128,13 @@ private:
                         if (index > 0)
                                 attachment_point = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, index, (LLViewerJointAttachment*)NULL);
 
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                         if ( (rlv_handler_t::isEnabled()) &&
-                                 ( ((index == 0) && (gRlvHandler.hasLockedAttachment())) ||                      // Can't wear on default attach point
-                                   ((index > 0) && (!gRlvHandler.isDetachable(attachment_point))) || // Can't replace locked attachment
-                                   (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) ) )                                          // Attach on rezzed object == "Take"
+                                 ( ((index == 0) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY))) ||          // Can't wear on default attach point
+                                   ((index > 0) &&                                                           // or replace a locked attachment
+                                    ((gRlvHandler.isLockedAttachment(attachment_point->getObject(), RLV_LOCK_REMOVE)) ||
+                                         (gRlvHandler.isLockedAttachment(attachment_point, RLV_LOCK_ADD)) ) ) || // or wear on a non-attachable attach point
+                                   (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) ) )                                                          // Attach on rezzed object == "Take"
                         {
                                 setObjectSelection(NULL); // Clear the selection or it'll get stuck
                                 return true;
@@ -6218,15 +6248,15 @@ class LLAttachmentDrop : public view_listener_t
                         return true;
                 }
 
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                 if (rlv_handler_t::isEnabled()) 
                 {
-                        if (gRlvHandler.hasLockedAttachment())
+                        if (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE))
                         {
                                 // NOTE: copy/paste of the code in enable_detach()
-                                LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
-                                RlvSelectHasLockedAttach functor;
-                                if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
+                                LLObjectSelectionHandle hSelection = LLSelectMgr::getInstance()->getSelection();
+                                RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
+                                if ( (hSelection->isAttachment()) && (hSelection->getFirstRootNode(&functor, FALSE)) )
                                         return true;
                         }
                         else if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
@@ -6254,8 +6284,8 @@ void handle_detach_from_avatar(void* user_data)
 
         if (attached_object)
         {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0d
-                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(attached_object)) )
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(attached_object, RLV_LOCK_REMOVE)) )
                 {
                         return;
                 }
@@ -6343,12 +6373,12 @@ class LLAttachmentDetach : public view_listener_t
                         return true;
                 }
 
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5) | Modified: RLVa-1.0.5
                 // NOTE: copy/paste of the code in enable_detach()
-                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                 {
                         LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
-                        RlvSelectHasLockedAttach functor;
+                        RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
                         if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
                                 return FALSE;
                 }
@@ -6460,16 +6490,16 @@ BOOL enable_detach(void*)
                 // ...if it's you, good to detach
                 if (avatar->getID() == gAgent.getID())
                 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5) | Modified: RLVa-1.0.5
                         // NOTE: this code is reused as-is in LLAttachmentDetach::handleEvent() and LLAttachmentDrop::handleEvent()
-                        //       so any changes here should be reflected there as well (I think it's in a number of other places as well by now)
+                        //       so any changes here should be reflected there as well
 
                         // RELEASE-RLVa: LLSelectMgr::sendDetach() and LLSelectMgr::sendDropAttachment() call sendListToRegions with
                         //               SEND_ONLY_ROOTS so we only need to examine the roots which saves us time
-                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                         {
                                 LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
-                                RlvSelectHasLockedAttach functor;
+                                RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
                                 if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
                                         return FALSE;
                         }
@@ -6496,7 +6526,7 @@ class LLAttachmentEnableDetach : public view_listener_t
 // Used to tell if the selected object can be attached to your avatar.
 BOOL object_selected_and_point_valid(void *user_data)
 {
-// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5) | Modified: RLVa-1.0.5
         if (rlv_handler_t::isEnabled())
         {
                 // RELEASE-RLVa: look at the caller graph for this function on every new release
@@ -6506,9 +6536,11 @@ BOOL object_selected_and_point_valid(void *user_data)
                 //      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / right-click / "Attach >" [user_data == pAttachPt]
                 //      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / Edit menu / "Attach Object" [user_data == pAttachPt]
                 LLViewerJointAttachment* pAttachPt = (LLViewerJointAttachment*)user_data;
-                if  ( ((!pAttachPt) && (gRlvHandler.hasLockedAttachment())) ||          // Don't allow attach to default attach point
-                          ((pAttachPt) && (!gRlvHandler.isDetachable(pAttachPt))) ||    // Don't allow replacing of locked attachment
-                          (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )                                    // Attaching a rezzed object == "Take"
+                if  ( ( (!pAttachPt) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) ) ||    // Don't allow attach to default attach point
+                          ( (pAttachPt) &&                                                                                                                      // Don't allow replacing of a locked attachment
+                            ( (gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) ||
+                              (gRlvHandler.isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) ) ) ||          // or wear on a non-attachable attach point
+                          (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )                                                            // Attaching a rezzed object == "Take"
                 {
                         return FALSE;
                 }
@@ -6585,7 +6617,7 @@ BOOL object_attached(void *user_data)
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
         return ( 
                       (attachment->getObject() != NULL) && 
-                          ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isDetachable(attachment->getObject())) )
+                          ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.isLockedAttachment(attachment->getObject(), RLV_LOCK_REMOVE)) )
                    );
 // [/RLVa:KB]
 //      return attachment->getObject() != NULL;
@@ -6737,12 +6769,13 @@ class LLToolsSelectedScriptAction : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+                // We'll allow resetting the scripts of objects on a non-attachable attach point since they wouldn't be able to circumvent anything
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                 {
-                        LLObjectSelectionHandle selectHandle = LLSelectMgr::getInstance()->getSelection();
-                        RlvSelectHasLockedAttach functor;
-                        if ( (selectHandle->isAttachment()) && (selectHandle->getFirstNode(&functor)) )
+                        LLObjectSelectionHandle hSelection = LLSelectMgr::getInstance()->getSelection();
+                        RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
+                        if ( (hSelection->isAttachment()) && (hSelection->getFirstNode(&functor)) )
                                 return true;
                 }
 // [/RLVa:KB]
@@ -6831,9 +6864,9 @@ void handle_dump_image_list(void*)
 
 void handle_test_male(void*)
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
         if ( (rlv_handler_t::isEnabled()) && 
-                 ( (gRlvHandler.hasLockedAttachment()) || 
+                 ( (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) || 
                    (gRlvHandler.hasBehaviour(RLV_BHVR_ADDOUTFIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REMOUTFIT)) ) )
         {
                 return;
@@ -6846,9 +6879,9 @@ void handle_test_male(void*)
 
 void handle_test_female(void*)
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
         if ( (rlv_handler_t::isEnabled()) && 
-                 ( (gRlvHandler.hasLockedAttachment()) || 
+                 ( (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) || 
                    (gRlvHandler.hasBehaviour(RLV_BHVR_ADDOUTFIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REMOUTFIT)) ) )
         {
                 return;
@@ -6990,16 +7023,16 @@ BOOL enable_more_than_one_selected(void* )
 
 static bool is_editable_selected()
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
         // RELEASE-RLVa: check that this still isn't called by anything but script actions in the Tools menu
-        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
         {
-                LLObjectSelectionHandle selectHandle = LLSelectMgr::getInstance()->getSelection();
+                LLObjectSelectionHandle hSelection = LLSelectMgr::getInstance()->getSelection();
 
                 // NOTE: this is called for 5 different menu items so we'll trade accuracy for efficiency and only
                 //       examine root nodes (LLToolsSelectedScriptAction::handleEvent() will catch what we miss)
-                RlvSelectHasLockedAttach functor;
-                if ( (selectHandle->isAttachment()) && (selectHandle->getFirstRootNode(&functor)) )
+                RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
+                if ( (hSelection->isAttachment()) && (hSelection->getFirstRootNode(&functor)) )
                 {
                         return false;
                 }
@@ -10452,6 +10485,35 @@ class LLAvatarReportAbuse : public view_listener_t
 
 
 
+////////////////////////////
+// ALLOW MULTIPLE VIEWERS //
+////////////////////////////
+
+
+class LLAdvancedToggleMultipleViewers : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                BOOL cur_val = gSavedSettings.getBOOL("AllowMultipleViewers");
+                gSavedSettings.setBOOL("AllowMultipleViewers", !cur_val );
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckMultipleViewers : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gSavedSettings.getBOOL("AllowMultipleViewers");
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
 ///////////////
 // RLVa Main //
 ///////////////
@@ -10893,7 +10955,8 @@ void initialize_menus()
         addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");
         addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
         addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
-
+        addMenu(new LLAdvancedToggleMultipleViewers(), "Advanced.ToggleMultipleViewers");
+        addMenu(new LLAdvancedCheckMultipleViewers(), "Advanced.CheckMultipleViewers");
 
         // RLVa
         addMenu(new RLVaMainToggle(), "RLVa.Main.Toggle");