Merge branch 'main' into maint-c

9 files changed, 41 insertions, 9 deletions

diff --git a/README.md b/README.md
index cc44250689..75b44ebef5 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,8 @@ $ export LL_BUILD="-O3 -std=c++17 -fPIC -DLL_LINUX=1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=OFF -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr ../indra
 $ make -j`nproc`
 $ makepkg -R
-$ sudo pacman -U megapahit-`cat newview/viewer_version.txt`-1-`uname -m`.pkg.tar.zst
+$ sudo pacman -U megapahit-`cat newview/viewer_version.txt|sed 's/\(.*\)\./\1-/'`-`uname -m`.pkg.tar.zst
+$ megapahit
 ```
 
 ### Gentoo
diff --git a/indra/newview/PKGBUILD.in b/indra/newview/PKGBUILD.in
index b2a02318f2..d917f216b6 100644
--- a/indra/newview/PKGBUILD.in
+++ b/indra/newview/PKGBUILD.in
@@ -1,7 +1,7 @@
 # Maintainer: $ENV{USER}@${VIEWER_PACKAGE_DOMAIN_NAME}
 pkgname=${VIEWER_BINARY_NAME}
-pkgver=${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}
-pkgrel=1
+pkgver=${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}
+pkgrel=${VIEWER_VERSION_REVISION}
 pkgdesc="${VIEWER_PACKAGE_COMMENT}"
 arch=('${CMAKE_SYSTEM_PROCESSOR}')
 url="https://${VIEWER_PACKAGE_DOMAIN_NAME}"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c4c5d88446..8b2d6dfd37 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2568,6 +2568,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/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index 4cd85ac756..bd29dba6bc 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -727,7 +727,7 @@ bool LLConversationSort::operator()(const LLConversationItem* const& a, const LL
             if ((type_a == LLConversationItem::CONV_SESSION_NEARBY) || (type_b == LLConversationItem::CONV_SESSION_NEARBY))
             {
                 // If one is the nearby session, put nearby session *always* last
-                return (type_b == LLConversationItem::CONV_SESSION_NEARBY);
+                return (!(type_b == LLConversationItem::CONV_SESSION_NEARBY));
             }
             else if (sort_order == LLConversationFilter::SO_SESSION_TYPE)
             {
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 0855a628fb..a9d952c05f 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -634,12 +634,14 @@ std::string LLFloaterIMSessionTab::appendTime()
     if (use_24h)
     {
         timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
-            "[" + LLTrans::getString("TimeMin") + "]";
+            "[" + LLTrans::getString("TimeMin") + "]:"
+            "[" + LLTrans::getString("TimeSec") + "]";
     }
     else
     {
         timeStr = "[" + LLTrans::getString("TimeHour12") + "]:"
-            "[" + LLTrans::getString("TimeMin") + "] ["
+            "[" + LLTrans::getString("TimeMin") + "]:"
+            "[" + LLTrans::getString("TimeSec") + "] ["
             + LLTrans::getString("TimeAMPM") + "]";
     }
 
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 4b9f109558..a4b5d0d431 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1126,6 +1126,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/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 8d088e277c..ec2d1471cc 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -70,7 +70,7 @@
      follows="all"
      left="10"
      name="megapahit_credits_panel"
-     height="370"
+     height="390"
      top="10">
       <text
           follows="top|left|right"
@@ -86,7 +86,7 @@ Megapahit is brought to you by (in order of appearance):
       <text_editor
        enabled="false"
        follows="top|left"
-       height="210"
+       height="230"
        bg_readonly_color="Transparent"
        left="5"
        text_color="LtGray"
@@ -95,6 +95,7 @@ Megapahit is brought to you by (in order of appearance):
        width="545"
        word_wrap="true">
 Erik Kundiman
+LinneNoir
 milo (observeur)
 Fritigern Gothly
 Hadet Sonnenkern
@@ -108,6 +109,7 @@ Melodey
 Hiroo Ono
 Keysin (scoutkeysin)
 gwigz
+Yikes Lopez
     </text_editor>
     <text
           follows="top|left"
@@ -133,7 +135,7 @@ with special thanks to (in order of appearance):
        width="450"
        word_wrap="true">
 Chorazin Allen and Nicky Perian for involving Erik Kundiman in viewer developments;
-LinneNoir for the moral support and initial testing;
+JenniWindrider for the pre-MP donation that was used to help build the website;
 Vir Linden for making it possible for the project to have a place (in every sense of the word) in SL;
 nutsobvious for the early testing and video proof;
 Soft Linden for the security testing; and
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 3b43b08201..48754a29dd 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="3Dconnexion devices"