1 files changed, 59 insertions, 6 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 4632800e2d..1b1d703f38 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4065,6 +4065,44 @@ void handle_avatar_eject(const LLSD& avatar_id)
         }
 }
 
+void handle_avatar_estate_kick(const LLSD& avatar_id)
+{
+    LLUUID id = avatar_id.asUUID();
+    if (id.isNull())
+    {
+        LLVOAvatar* avatar = find_avatar_from_object(
+            LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
+        if (avatar) id = avatar->getID();
+    }
+    if (id.notNull())
+    {
+        LLAvatarActions::estateKickAvatar(id);
+    }
+}
+
+void handle_avatar_estate_ban(const LLSD& avatar_id)
+{
+    LLUUID id = avatar_id.asUUID();
+    if (id.isNull())
+    {
+        LLVOAvatar* avatar = find_avatar_from_object(
+            LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
+        if (avatar) id = avatar->getID();
+    }
+    if (id.notNull())
+    {
+        LLAvatarActions::estateBanAvatar(id);
+    }
+}
+
+bool enable_estate_eject_ban(const LLSD& avatar_id)
+{
+    LLViewerRegion* region = gAgent.getRegion();
+    if (!region) return false;
+    if (gAgent.isGodlike()) return true;
+    return region->getOwner() == gAgent.getID() || region->isEstateManager();
+}
+
 bool my_profile_visible()
 {
     LLFloater* floaterp = LLAvatarActions::getProfileFloater(gAgentID);
@@ -4778,25 +4816,37 @@ class LLViewMouselook : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
     {
+        // When OTS is enabled M toggles OTS mode (shoulder cam).
+        // When disabled M toggles normal first-person mouselook.
+        if (gSavedSettings.getBOOL("OTSEnabled"))
+        {
+            if (!gAgentCamera.cameraOTS())
+            {
+                gAgentCamera.changeCameraToOTS();
+            }
+            else
+            {
+                gAgentCamera.changeCameraFromOTS();
+            }
+            return true;
+        }
+
         if (!gAgentCamera.cameraMouselook())
         {
             gAgentCamera.changeCameraToMouselook();
         }
         else
         {
-            // NaCl: Right-click + scroll wheel zoom in mouselook (ported from Firestorm).
-            // If we were zoomed when the user toggles out of mouselook, restore the
-            // normal (pre-zoom) FOV before switching back to the default camera.
+            // NaCl: restore FOV on mouselook exit
             LLVector3 mlFovValues = gSavedSettings.getVector3("_NACL_MLFovValues");
             F32 cameraAngle = gSavedSettings.getF32("CameraAngle");
             if (mlFovValues.mV[VZ] > 0.0f)
             {
-                mlFovValues.mV[VY] = cameraAngle;   // preserve last zoomed FOV
+                mlFovValues.mV[VY] = cameraAngle;
                 mlFovValues.mV[VZ] = 0.0f;
                 gSavedSettings.setVector3("_NACL_MLFovValues", mlFovValues);
-                gSavedSettings.setF32("CameraAngle", mlFovValues.mV[VX]); // restore normal FOV
+                gSavedSettings.setF32("CameraAngle", mlFovValues.mV[VX]);
             }
-            // NaCl End
             gAgentCamera.changeCameraToDefault();
         }
         return true;
@@ -10346,6 +10396,9 @@ void initialize_menus()
     view_listener_t::addMenu(new LLAvatarVisibleDebug(), "Avatar.VisibleDebug");
     view_listener_t::addMenu(new LLAvatarInviteToGroup(), "Avatar.InviteToGroup");
     commit.add("Avatar.Eject", boost::bind(&handle_avatar_eject, LLSD()));
+    commit.add("Avatar.EstateKick", boost::bind(&handle_avatar_estate_kick, _2));
+    commit.add("Avatar.EstateBan", boost::bind(&handle_avatar_estate_ban, _2));
+    enable.add("Avatar.EnableEstateEjectBan", boost::bind(&enable_estate_eject_ban, _2));
     commit.add("Avatar.ShowInspector", boost::bind(&handle_avatar_show_inspector));
     view_listener_t::addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
     view_listener_t::addMenu(new LLAvatarCall(), "Avatar.Call");