Merge branch 'main' into maint-c

3 files changed, 15 insertions, 3 deletions

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"