Merge branch 'main' into 2024.09-ExtraFPS

5 files changed, 29 insertions, 1 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ce232284d5..70f9247d72 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2557,6 +2557,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>DoubleClickZoomIn</key>
+    <map>
+      <key>Comment</key>
+      <string>Set double-click to zoom in on instead of IM avatar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>DynamicCameraStrength</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index fe0916bf15..3bef74f376 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -592,7 +592,8 @@ void LLFloaterIMSessionTab::deleteAllChildren()
 std::string LLFloaterIMSessionTab::appendTime()
 {
     std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
-                          "[" + LLTrans::getString("TimeMin") + "]";
+                          "[" + LLTrans::getString("TimeMin") + "]:"
+                          "[" + LLTrans::getString("TimeSec") + "]";
 
     LLSD substitution;
     substitution["datetime"] = (S32)time_corrected();
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 366c80f580..72fa553023 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1127,6 +1127,12 @@ void LLPanelPeople::onAvatarListDoubleClicked(LLUICtrl* ctrl)
 #if 0 // SJB: Useful for testing, but not currently functional or to spec
     LLAvatarActions::showProfile(clicked_id);
 #else // spec says open IM window
+    if (item->getParentUICtrl()->getParentUICtrl() == mNearbyList
+        && gSavedSettings.getBOOL("DoubleClickZoomIn"))
+    {
+        handle_zoom_to_object(clicked_id);
+        return;
+    }
     LLAvatarActions::startIM(clicked_id);
 #endif
 }
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index e6a55b3ca0..129ca5344c 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -38,6 +38,7 @@
 
 	<string name="TimeHour">hour,datetime,slt</string>
 	<string name="TimeMin">min,datetime,slt</string>	
+	<string name="TimeSec">second,datetime,slt</string>
 	<string name="TimeYear">year,datetime,slt</string>	
 	<string name="TimeDay">day,datetime,slt</string>	
 	<string name="TimeMonth">mthnum,datetime,slt</string>	
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 0412466b4f..8202bb9de3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -268,6 +268,15 @@
    name="sound_on_collisions"
    top_pad="10"
    width="200" />
+  <check_box
+   control_name="DoubleClickZoomIn"
+   height="20"
+   label="Double click on nearby list to zoom in on avatar"
+   layout="topleft"
+   left="83"
+   name="double_click_zoom_in"
+   top_pad="10"
+   width="200" />
   <button
    height="23"
    label="Other Devices"