From ffc6ed2a93aa1b22b1c8ba80544f3d0915cde9a7 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Mon, 17 Oct 2022 13:22:56 -0700
Subject: [PATCH 01/22] SL-18218: Switch canonical_repo to GitHub URL

---
 autobuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5a5ffa2898..25d95a6849 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2888,7 +2888,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
     <key>package_description</key>
     <map>
       <key>canonical_repo</key>
-      <string>https://bitbucket.org/lindenlab/viewer</string>
+      <string>https://github.com/secondlife/viewer</string>
       <key>copyright</key>
       <string>Copyright (c) 2020, Linden Research, Inc.</string>
       <key>description</key>

From 02c2a0aba3b7f771b38025dabcc8e1c2c3ee346d Mon Sep 17 00:00:00 2001
From: Pantera <panterapolnocy@gmail.com>
Date: Fri, 11 Nov 2022 13:18:06 +0100
Subject: [PATCH 02/22] FIRE-32403 Russian translation update, by Romka
 Swallowtail

---
 indra/newview/skins/default/xui/ru/floater_about_land.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml
index 95c9a50a08..87ba60630a 100644
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -4,13 +4,13 @@
         [HOURS] ч
     </floater.string>
     <floater.string name="Hour">
-        ч
+        ч.
     </floater.string>
     <floater.string name="Minutes">
         [MINUTES] мин.
     </floater.string>
     <floater.string name="Minute">
-        минута
+        мин.
     </floater.string>
     <floater.string name="Seconds">
         [SECONDS] с.
@@ -431,6 +431,10 @@
             <check_box label="Включить голос" name="parcel_enable_voice_channel"/>
             <check_box label="Включить голос (устанавливается владельцем острова)" name="parcel_enable_voice_channel_is_estate_disabled" width="300" />
             <check_box label="Ограничить голос границами данного участка" name="parcel_enable_voice_channel_local"/>
+            <text name="media">
+                Медиа:
+            </text>
+            <check_box label="Непонятные Медина на объекте" name="obscure_moap" tool_tip="Медиа на объекте, расположенном за пределами участка, не должен автоматически воспроизводиться для агента внутри этой участка и наоборот."/>
         </panel>
         <panel label="Доступ" name="land_access_panel">
             <panel.string name="access_estate_defined">

From e48fd7bbccf3de5a6477921c1b8125dae19360f9 Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Sat, 12 Nov 2022 19:48:09 +0100
Subject: [PATCH 03/22] Follow skin changes on Vintage for voice speaker
 controls

---
 .../skins/vintage/xui/en/floater_fs_voice_controls.xml   | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/indra/newview/skins/vintage/xui/en/floater_fs_voice_controls.xml b/indra/newview/skins/vintage/xui/en/floater_fs_voice_controls.xml
index c94f23bde9..4890b23fce 100644
--- a/indra/newview/skins/vintage/xui/en/floater_fs_voice_controls.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_fs_voice_controls.xml
@@ -105,15 +105,6 @@
          show_icons="false"
          show_voice_volume="false"
          width="280" />
-        <panel
-         filename="panel_avatar_list_item.xml"
-         follows="left|right|top"
-         height="24"
-         layout="topleft"
-         left="0"
-         name="non_avatar_caller"
-         top="10"
-         width="276" />
         <text
          follows="all"
          font="SansSerif"

From 1093c25d1d1a6ebee0d7fdc4e0aad7f283600295 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 12 Nov 2022 20:47:37 +0100
Subject: [PATCH 04/22] Do not cut off buttons at the bottom of group banlist
 tab

---
 .../skins/default/xui/en/panel_group_roles.xml       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 0b6a9bf2e0..bbe3c055b2 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -375,7 +375,7 @@ things in this group. There&apos;s a broad variety of Abilities.
       <name_list
            column_padding="0"
            draw_heading="true"
-           height="114"
+           height="110"
            follows="left|top|right"
            layout="topleft"
            left="0"
@@ -399,7 +399,7 @@ things in this group. There&apos;s a broad variety of Abilities.
       </name_list>
       <button
         follows="top|left"
-        height="23"
+        height="20"
         label="Ban Resident(s)"
         layout="topleft"
         left="3"
@@ -408,7 +408,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         width="120" />
       <button
         follows="top|left"
-        height="23"
+        height="20"
         label="Remove Ban(s)"
         layout="topleft"
         left_pad="5"
@@ -417,8 +417,8 @@ things in this group. There&apos;s a broad variety of Abilities.
         width="120" />
       <button
         follows="top|left"
-        height="23"
-        width="23"
+        height="20"
+        width="20"
         image_overlay="Refresh_Off"
         layout="topleft"
         left_pad="5"
@@ -427,7 +427,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         />
       <text
         type="string"
-        height="18"
+        height="20"
         left_pad="5"
         follows="top|left|right"
         layout="topleft"

From b213b4d4ae5280aec586b53e836bd5d90c3adfc6 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 13 Nov 2022 10:10:25 +0000
Subject: [PATCH 05/22] phototools2.1 integration

---
 .../xui/en/floater_fixedenvironment.xml       | 306 ++++----
 .../default/xui/en/floater_phototools.xml     | 219 ++++--
 .../xui/en/panel_settings_sky_atmos.xml       | 742 ++++++++++--------
 .../xui/en/panel_settings_sky_clouds.xml      | 693 +++++++++-------
 .../xui/en/panel_settings_sky_sunmoon.xml     | 651 +++++++++------
 .../default/xui/en/panel_settings_water.xml   | 499 ++++++++----
 6 files changed, 1846 insertions(+), 1264 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 8346268fa4..c3b2dbf989 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -1,162 +1,150 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-        can_tear_off="false"
-        can_resize="false"
-        can_drag_on_left="false"
-        can_close="true"
-        can_dock="false"
-        bevel_style="in"
-        height="550"
-        layout="topleft"
-        name="Fixed Environment"
-        save_rect="true"
-        title="Fixed Environment"
-        save_visibility="false"
-        help_topic="fs_fixed_environment"
-        single_instance="true" 
-        width="750">
-    <string name="edit_sky">Edit Sky:</string>
-    <string name="edit_water">Edit Water:</string>
-    <layout_stack name="floater_stack"
-            left="5"
-            top="5"
-            right="-5"
-            bottom="-5"
-            follows="left|top|right|bottom"
-            orientation="vertical">
-        <layout_panel name="info_panel"
-                auto_resize="false"
-                user_resize="false"
-                min_height="60">
-            <text
-                    follows="left|top"
-                    top_delta="30"
-                    left_delta="10"
-                    width="35"
-                    height="20"
-                    name="info_panel_label"
-                    font="SansSerif">
-                Name:
-            </text>
-            <line_editor
-                    follows="left|top"
-                    top_delta="-2"
-                    left_delta="45"
-                    width="250"
-                    name="settings_name"
-                    prevalidate_callback="ascii"
-                    max_length_chars="63"
-                    height="20"/>
-            <button
-                    height="23"
-                    label="Load"
-                    follows="left|top"
-                    left_delta="260"
-                    font="SansSerif"
-                    top_delta="-2"
-                    name="btn_load"
-                    tool_tip="Load a settings from inventory" 
-                    width="96" />
-            <button
-                    height="23"
-                    label="Import"
-                    follows="right|top"
-                    right="-10"
-                    font="SansSerif"
-                    top_delta="0"
-                    name="btn_import"
-                    tool_tip="Import legacy settings from disk." 
-                    width="96" />
-        </layout_panel>
-        <layout_panel name="tab_area"
-                auto_resize="true"
-                user_resize="false"
-                height="11"
-                min_height="0"
-                visible="true">
-            <tab_container
-                    follows="all"
-                    halign="left"
-                    layout="topleft"
-                    left="0"
-                    name="tab_settings"
-                    tab_position="top"
-                    tab_width="120"
-                    tab_padding_right="3">
-                <!-- Tabs inserted here in code -->
-            </tab_container>
-        </layout_panel>
-        <layout_panel name="button_panel"
-                follows="left|top|right|bottom"
-                auto_resize="false"
-                user_resize="false"
-                height="29"
-                visible="true">
-            <layout_stack
-                    follows="bottom|left|right"
-                    height="23"
-                    layout="topleft"
-                    mouse_opaque="false"
-                    name="button_bar_ls"
-                    left="212"
-                    orientation="horizontal"
-                    top="0"
-                    width="313">
-                <layout_panel
-                        follows="bottom|left|right"
-                        height="23"
-                        layout="bottomleft"
-                        left="0"
-                        mouse_opaque="false"
-                        name="save_btn_lp"
-                        auto_resize="true"
-                        width="156">
-                    <button
-                            follows="bottom|left|right"
-                            height="23"
-                            label="Save"
-                            left="1"
-                            layout="topleft"
-                            name="btn_commit"
-                            top="0"
-                            width="155" />
-                    <button
-                            follows="bottom|right"
-                            height="23"
-                            name="btn_flyout"
-                            label=""
-                            layout="topleft"
-                            left_pad="-20"
-                            tab_stop="false"
-                            top="0"
-                            image_selected="SegmentedBtn_Right_Selected_Press"
-                            image_unselected="SegmentedBtn_Right_Off"
-                            image_pressed="SegmentedBtn_Right_Press"
-                            image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-                            image_overlay="Arrow_Small_Up"
-                            width="20"/>
-                </layout_panel>
-                <layout_panel
-                        follows="bottom|left|right"
-                        height="23"
-                        layout="bottomleft"
-                        left_pad="3"
-                        mouse_opaque="false"
-                        name="revert_btn_lp"
-                        auto_resize="true"
-                        width="147">
-                    <button
-                            follows="bottom|right"
-                            height="23"
-                            right="-1"
-                            label="Cancel"
-                            layout="topleft"
-                            name="btn_cancel"
-                            top="0"
-                            tool_tip="Revert to last saved version"
-                            width="147" />
-                </layout_panel>
-            </layout_stack>
-        </layout_panel>
-    </layout_stack>
+can_tear_off="false"
+can_resize="false"
+can_drag_on_left="false"
+can_close="true"
+can_dock="true"
+bevel_style="in"
+height="530"
+layout="topleft"
+name="Fixed Environment"
+save_rect="true"
+title="Fixed Environment"
+save_visibility="false"
+help_topic="fs_fixed_environment"
+single_instance="true" 
+width="260">
+
+<string name="edit_sky">Edit Sky:</string>
+<string name="edit_water">Edit Water:</string>
+
+	<panel
+		name="P_Presetname"
+		follows="left|top"
+		layout="topleft"
+		top_pad="5"
+		left="5"
+		width="250"
+		height="30"
+		border_visible="true"
+		bevel_style="in"
+		background_visible="true">
+
+			<text
+				follows="left|top"
+				top_pad="10"
+				left="0"
+				width="40"
+				height="10"
+				name="info_panel_label">
+				Name:
+			</text>
+			
+			<line_editor
+				follows="left|top"
+				top_delta="-5"
+				left_pad="0"
+				width="205"
+				name="settings_name"
+				prevalidate_callback="ascii"
+				max_length_chars="63"
+				height="20"/>
+			
+	</panel>
+	
+	<panel
+	name="P_Environment_Tab"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="5"
+	width="250"
+	height="445"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+		<tab_container
+			follows="all"
+			halign="center"
+			layout="topleft"
+			left="0"
+			top_pad="5"
+			height="440"
+			width="250"
+			name="tab_settings"
+			tab_position="top"
+			tab_max_width="80"
+			tab_width="80">
+		</tab_container>
+	</panel>
+
+	<panel
+		name="info_panel"
+		follows="left|top"
+		layout="topleft"
+		top_pad="0"
+		left="5"
+		width="250"
+		height="33"
+		border_visible="true"
+		bevel_style="in"
+		background_visible="true">
+
+		<button
+			height="23"
+			label="Load"
+			follows="left|top"
+			left="5"
+			top_pad="5"
+			name="btn_load"
+			tool_tip="Load a settings from inventory" 
+			width="55" />
+			
+		<button
+			height="23"
+			label="Import"
+			follows="left|top"
+			left_pad="01"
+			top_delta="0"
+			name="btn_import"
+			tool_tip="Import legacy settings from disk." 
+			width="55" />
+			
+		<button
+			follows="left|top"
+			height="23"
+			label="Save"
+			left_pad="1"
+			layout="topleft"
+			name="btn_commit"
+			top_delta="0"
+			width="55" />
+		<button
+			follows="left|top"
+			height="23"
+			name="btn_flyout"
+			label=""
+			layout="topleft"
+			left_pad="0"
+			tab_stop="false"
+			top_delta="0"
+			image_selected="SegmentedBtn_Right_Selected_Press"
+			image_unselected="SegmentedBtn_Right_Off"
+			image_pressed="SegmentedBtn_Right_Press"
+			image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+			image_overlay="Arrow_Small_Up"
+			width="20"/>
+		<button
+			follows="left|top"
+			height="23"
+			left_pad="0"
+			label="Cancel"
+			layout="topleft"
+			name="btn_cancel"
+			top_delta="0"
+			tool_tip="Revert to last saved version"
+			width="55" />
+	</panel>
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_phototools.xml b/indra/newview/skins/default/xui/en/floater_phototools.xml
index b101bc2781..253ce3aec8 100644
--- a/indra/newview/skins/default/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/default/xui/en/floater_phototools.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <floater
- positioning="right"
+ positioning="left"
  can_resize="false"
  can_dock="false"
  can_close="true"
@@ -254,8 +254,7 @@
 				 label_selected=""
 				 scale_image="true"
 				/>
-				
-				
+								
 				<button
 				 follows="top|left|right"
 				 height="20"
@@ -280,6 +279,30 @@
 				</button>
 			</panel>
 
+			<panel
+			 name="PT_WL_Presets"
+			 follows="top|left"
+			 layout="topleft"
+			 top_pad="5"
+			 left="0"
+			 width="285"
+			 height="22"
+			 bg_alpha_color="Phototools_Header"
+			 border_visible="true"
+			 border_thickness="1"
+			 background_visible="true">
+				<text
+				 name="T_WL_Presets" 
+				 follows="left|top"
+				 layout="topleft"
+				 left="10"
+				 font="SansSerif"
+				 height="17"
+				 width="200">
+					Customizing Presets 
+				</text>
+			</panel>
+
 			<panel
 			 visible="true"
 			 name="P_Q_Windlights"
@@ -287,7 +310,7 @@
 			 layout="topleft"
 			 top_pad="5"
 			 left="4"
-			 width="275"
+			 width="135"
 			 height="135"
 			 border_visible="true"
 			 background_visible="true">
@@ -295,31 +318,31 @@
 				 name="T_Q_Windlights"
 				 follows="left|top"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="5"
 				 height="20"
 				 word_wrap="true"
-				 width="155">
-					Quick Environments
+				 width="125">
+					Quick Selection
 				</text>
 				<view_border
 				 bevel_style="none"
 				 follows="left|top"
 				 height="0"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="horiz_separator1"
 				 top_pad="-7"
-				 width="255"/>
+				 width="125"/>
 				<button
 				 follows="left|top"
 				 name="Sunrise"
 				 height="20"
 				 label="Sunrise"
 				 layout="topleft"
-				 left="10"
+				 left="05"
 				 top_pad="5"
-				 width="255">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="sunrise"/>
@@ -330,9 +353,9 @@
 				 height="20"
 				 label="Noon"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="2"
-				 width="255">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="noon"/>
@@ -343,9 +366,9 @@
 				 height="20"
 				 label="Sunset"
 				 layout="topleft"
-				 left="10"
+				 left="05"
 				 top_pad="2"
-				 width="255">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="sunset"/>
@@ -356,9 +379,9 @@
 				 height="20"
 				 label="Midnight"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="2"
-				 width="255">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="midnight"/>
@@ -369,17 +392,17 @@
 				 height="20"
 				 label="Shared Environment"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="2"
-				 width="255">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="region"/>
 				</button>
 			</panel>
-			
+
 			<panel
-			 visible="false"
+			 visible="True"
 			 name="P_WL_Presets"
 			 follows="top|left"
 			 layout="topleft"
@@ -393,87 +416,90 @@
 				 name="T_WL_Presets"
 				 follows="left|top"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="5"
 				 height="20"
 				 word_wrap="true"
 				 tool_tip="Click an item below to create new preset or modify an existing one."
-				 width="150">
-					Windlight Presets
+				 width="130">
+					Manage Presets
 				</text>
 				<view_border
 				 bevel_style="none"
 				 follows="left|top"
 				 height="0"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="horiz_separator2"
 				 top_pad="-7"
-				 width="120"/>
-				<button
+				 width="125"/>
+				<!--button
 				 follows="left|top"
 				 name="new_sky_preset"
 				 height="20"
 				 label="New Sky Preset"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="5"
-				 width="120">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="new_sky"/>
-				</button>
+				</button-->
 				<button
 				 follows="left|top"
 				 name="edit_sky_preset"
 				 height="20"
-				 label="Edit Sky Preset"
+				 label="Sky Preset"
 				 layout="topleft"
-				 left="10"
-				 top_pad="2"
-				 width="120">
+				 left="5"
+				 top_pad="5"
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="edit_sky"/>
 				</button>
 			
-				<view_border
+				<!--view_border
 				 bevel_style="none"
 				 follows="left|top"
 				 height="0"
 				 layout="topleft"
 				 left="5"
 				 name="horiz_separator3"
-				 top_pad="10"
-				 width="125"/>
-				<button
+				 top_pad="5"
+				 width="125"/-->
+				<!--button
 				 follows="left|top"
 				 name="new_water_preset"
 				 height="20"
 				 label="New Water Preset"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="10"
-				 width="120">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="new_water"/>
-				</button>
+				</button-->
 				<button
 				 follows="left|top"
 				 name="edit_water_preset"
 				 height="20"
-				 label="Edit Water Preset"
+				 label="Water Preset"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 top_pad="2"
-				 width="120">
+				 width="125">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="edit_water"/>
 				</button>
-			</panel>
+				
 
+
+			</panel>
+			
 			<panel
 			 name="P_W_Reflections"
 			 follows="top|left"
@@ -558,7 +584,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="54"
+			 height="75"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -758,7 +784,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="165"
+			 height="180"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -776,7 +802,7 @@
 				 control_name="RenderShadowResolutionScale"
 				 follows="left|right"
 				 height="16"
-				 increment="0.01"
+				 increment="0.5"
 				 layout="topleft"
 				 left_pad="-20"
 				 min_val="0"
@@ -869,11 +895,11 @@
 				 control_name="RenderShadowBlurSize"
 				 follows="left|right"
 				 height="16"
-				 increment="0.01"
+				 increment="1"
 				 layout="topleft"
 				 left_pad="-20"
 				 min_val="0.00"
-				 max_val="4"
+				 max_val="20"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -918,11 +944,11 @@
 				 name="SB_Shd_Soften"
 				 follows="left|right"
 				 height="16"
-				 increment="0.001"
+				 increment="0.01"
 				 layout="topleft"
 				 left_pad="-20"
-				 min_val="0.001"
-				 max_val="3"
+				 min_val="0.01"
+				 max_val="1"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -1046,7 +1072,60 @@
 				</button>
 
 				<text
-				 name="T_Shd_Bias"
+				 name="T_FOV_Cutoff"
+				 follows="top|left"
+				 layout="topleft"
+				 left="5"
+				 top_pad="5"
+				 tool_tip="This determines the FOV cutoff at which the viewer will switch between ortho instead of perspective projection. If you are getting shadows that are 'jaggedy' try adjusting this setting for improvement. Also adjusting the XYZ values for the debug setting RenderShadowSplitExponent can be VERY helpful."
+				 width="80">
+					Spot Offset
+				</text>
+				<slider_bar
+				 name="SB_FOV_Cutoff"
+				 can_edit_text="true"
+				 control_name="RenderSpotShadowOffset"
+				 follows="left|right"
+				 height="16"
+				 increment="0.0001"
+				 decimal_digits="4"
+				 layout="topleft"
+				 left_pad="-20"
+				 min_val="0"
+				 max_val=".04"
+				 top_delta="-2"
+				 width="127"/>
+				<spinner
+				 name="S_FOV_Cutoff"
+				 can_edit_text="true"
+				 control_name="RenderSpotShadowOffset"
+				 top_delta="-3"
+				 label_width="0"
+				 left_pad="3"
+				 decimal_digits="4"
+				 follows="top|right"
+				 max_val="100"
+				 min_val="0"
+				 width="53"
+				 increment="0.001"
+				 border_visible="false"/>
+				<button
+				 follows="left|top"
+				 name="FOV_Cutoff_Reset"
+				 height="22"
+				 label="D"
+				 layout="topleft"
+				 left_pad="0"
+				 top_delta="0"
+				 width="20"
+				 tool_tip="Reset to the default value.">
+					<button.commit_callback
+					 function="ResetControl"
+					 parameter="RenderSpotShadowOffset"/>
+				</button>
+				
+				<text																																																												
+				name="T_Shd_Bias"
 				 follows="top|left"
 				 layout="topleft"
 				 left="5"
@@ -1063,8 +1142,8 @@
 				 increment="0.0001"
 				 layout="topleft"
 				 left_pad="-20"
-				 min_val="-.008"
-				 max_val="0"
+				 min_val="-.00001"
+				 max_val="0.01"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -1150,7 +1229,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="120"
+			 height="115"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -1318,7 +1397,7 @@
 				 increment="0.001"
 				 layout="topleft"
 				 left_pad="-20"
-				 min_val="0"
+				 min_val="-10"
 				 max_val="1"
 				 top_delta="-2"
 				 width="127"/>
@@ -1363,7 +1442,7 @@
 				 layout="topleft"
 				 left_pad="-20"
 				 min_val="0.001"
-				 max_val="3"
+				 max_val="5"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -1489,7 +1568,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="175"
+			 height="185"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -1553,6 +1632,7 @@
 				</text>
 				<slider_bar
 				 name="SB_FOV"
+				 
 				 control_name="CameraFieldOfView"
 				 follows="left|top"
 				 height="16"
@@ -1565,6 +1645,7 @@
 				 width="127"/>
 				<spinner
 				 name="S_FOV"
+				 
 				 control_name="CameraFieldOfView"
 				 top_delta="-3"
 				 label_width="0"
@@ -1574,7 +1655,8 @@
 				 max_val="360"
 				 min_val="-360"
 				 width="53"
-				 increment="0.1"/>
+				 increment="0.1"
+								/>
 				<button
 				 follows="left|top"
 				 name="Reset_FOV"
@@ -1602,6 +1684,7 @@
 				</text>
 				<slider_bar
 				 name="SB_F_Number"
+
 				 control_name="CameraFNumber"
 				 follows="top|left"
 				 height="16"
@@ -1614,6 +1697,7 @@
 				 width="127"/>
 				<spinner
 				 name="S_F_Number"
+				 
 				 control_name="CameraFNumber"
 				 top_delta="-3"
 				 label_width="0"
@@ -1623,7 +1707,8 @@
 				 max_val="128"
 				 min_val="-128"
 				 width="53"
-				 increment=".01"/>
+				 increment=".01"
+								/>
 				<button
 				 follows="left|top"
 				 name="Reset_F_Number"
@@ -1651,6 +1736,7 @@
 				</text>
 				<slider_bar
 				 name="SB_Focal_Length"
+				 
 				 control_name="CameraFocalLength"
 				 follows="top|left"
 				 height="16"
@@ -1663,6 +1749,7 @@
 				 width="127"/>
 				<spinner
 				 name="S_Focal_Length"
+				 
 				 control_name="CameraFocalLength"
 				 top_delta="-3"
 				 label_width="0"
@@ -1672,7 +1759,8 @@
 				 max_val="10000"
 				 min_val="0"
 				 width="53"
-				 increment="1"/>
+				 increment="1"
+								/>
 				<button
 				 follows="left|top"
 				 name="Reset_Focal_Length"
@@ -1700,6 +1788,7 @@
 				</text>
 				<slider_bar
 				 name="SB_Foc_Time"
+				 
 				 control_name="CameraFocusTransitionTime"
 				 follows="top|left"
 				 height="16"
@@ -1712,6 +1801,7 @@
 				 width="127"/>
 				<spinner
 				 name="S_Foc_Time"
+				 
 				 control_name="CameraFocusTransitionTime"
 				 top_delta="-3"
 				 label_width="0"
@@ -1721,7 +1811,8 @@
 				 max_val="100"
 				 min_val=".001"
 				 width="53"
-				 increment="0.01"/>
+				 increment="0.01"
+									/>
 				<button
 				 follows="left|top"
 				 name="Reset_Foc_Time"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index d01318d0b7..d08b8ecc5f 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -1,339 +1,411 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-        border="true"
-        follows="all"
-        label="Atmosphere &amp; Lighting"
-        layout="topleft"
-        left="0"
-        name="panel_settings_sky_atmos"
-        top="0">
-    <layout_stack
-            name="main_ls"
-            follows="all"
-            layout="topleft"
-            left="5"
-            top="5"
-            right="-5"
-            bottom="-5"
-            orientation="vertical">
-        <layout_panel
-                name="top_lp"
-                border="true"
-                bevel_style="in"
-                auto_resize="false"
-                user_resize="false"
-                visible="true"
-                height="75">
+border="true"
+follows="all"
+label="Atmos"
+layout="topleft"
+left="0"
+name="panel_settings_sky_atmos"
+top="0">
+		
+	<panel
+	name="P_Atmosphere_Header"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="22"
+	bg_alpha_color="EmphasisColor"
+	border_visible="true"
+	border_thickness="1"
+	background_visible="true">
+	
+		<text
+		name="T_Atmosphere_Header"
+		follows="left|top"
+		layout="topleft"
+		left="5"
+		font="SansSerif"
+		value="Atmospheric Colors"/>
+			
+	</panel>
 
-            <text
-                    name="ambient_color_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_pad="15"
-                    top_pad="15"
-                    width="100">
-                Ambient Color:
-            </text>
-            <color_swatch
-                    can_apply_immediately="true"
-                    follows="left|top"
-                    height="37"
-                    label_height="0"
-                    layout="topleft"
-                    left_delta="0"
-                    name="ambient_light"
-                    top_pad="5"
-                    width="60" />
-            <text
-                    name="blue_horizon_label"
-                    follows="left"
-                    height="10"
-                    layout="topleft"
-                    left_delta="110"
-                    top_delta="-15"
-                    width="100">
-                Blue Horizon:
-            </text>
-            <color_swatch
-                    can_apply_immediately="true"
-                    follows="left|top"
-                    height="37"
-                    label_height="0"
-                    layout="topleft"
-                    left_delta="0"
-                    name="blue_horizon"
-                    top_pad="5"
-                    width="60" />
-            <text
-                    name="blue_density_label"
-                    follows="left"
-                    height="10"
-                    layout="topleft"
-                    left_delta="110"
-                    top_delta="-15"
-                    width="100">
-                Blue Density:
-            </text>
-            <color_swatch
-                    can_apply_immediately="true"
-                    follows="left|top"
-                    height="37"
-                    label_height="0"
-                    layout="topleft"
-                    left_delta="0"
-                    name="blue_density"
-                    top_pad="5"
-                    width="60" />
-        </layout_panel>
-        <layout_panel
-                name="bottom_lp"
-                border="true"
-                bevel_style="in"
-                auto_resize="true"
-                user_resize="false"
-                visible="true">
-            <layout_stack name="atmosphere1"
-                    left="5"
-                    top="5"
-                    right="-5"
-                    bottom="-5"
-                    follows="left|top|right|bottom"
-                    orientation="hoizontal">
-                <layout_panel
-                        name="left_lp"
-                        border="false"
-                        bevel_style="in"
-                        auto_resize="true"
-                        user_resize="false"
-                        visible="true"
-                        min_width="225">
-                    <text
-                            name="haze_horizon_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="10"
-                            width="100">
-                        Haze Horizon:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_pad="5"
-                            min_val="0"
-                            max_val="5"
-                            name="haze_horizon"
-                            top_delta="0"
-                            width="207"
-                            can_edit_text="true"/>
-                    <text
-                            name="haze_density_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="15"
-                            width="100">
-                        Haze Density:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_pad="5"
-                            min_val="0"
-                            max_val="5"
-                            name="haze_density"
-                            top_delta="0"
-                            width="207"
-                            can_edit_text="true"/>
-                    <text
-                            name="moisture_level_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="15"
-                            width="100">
-                        Moisture Level:
-                    </text>
-                     <slider
-                            decimal_digits="3"
-                            follows="left|top"
-                            height="14"
-                            increment="0.001"
-                            initial_value="0"
-                            left_pad="5"
-                            top_delta="0"
-                            layout="topleft"
-                            min_val="0"
-                            max_val="1"
-                            name="moisture_level"
-                            width="207"
-                            can_edit_text="true"/>
-                    <text
-                            name="droplet_radius_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="15"
-                            width="100">
-                        Droplet Radius:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="14"
-                            increment="0.01"
-                            initial_value="0"
-                            left_pad="5"
-                            top_delta="0"
-                            layout="topleft"
-                            min_val="5.0"
-                            max_val="1000.0"
-                            name="droplet_radius"
-                            width="207"
-                            can_edit_text="true"/>
-                    <text
-                            name="ice_level_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="15"
-                            width="100">
-                        Ice Level:
-                    </text>
-                    <slider
-                            decimal_digits="3"
-                            follows="left|top"
-                            height="14"
-                            increment="0.001"
-                            initial_value="0"
-                            left_pad="5"
-                            layout="topleft"
-                            top_delta="0"
-                            min_val="0"
-                            max_val="1"
-                            name="ice_level"
-                            width="207"
-                            can_edit_text="true"/>
-                </layout_panel>            
-                <layout_panel
-                        name="right_lp"
-                        border="false"
-                        bevel_style="in"
-                        auto_resize="true"
-                        user_resize="false"
-                        visible="true"
-                        min_width="225">
-                    <text
-                            name="density_multiplier_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="10"
-                            width="105">
-                        Density Multiplier:
-                    </text>
-                    <slider
-                            decimal_digits="4"
-                            follows="left|top"
-                            height="16"
-                            increment="0.0001"
-                            initial_value="0"
-                            layout="topleft"
-                            left_pad="5"
-                            min_val="0.0001"
-                            max_val="2"
-                            name="density_multip"
-                            top_delta="0"
-                            width="219"
-                            can_edit_text="true"/>
-                    <text
-                            name="distance_multiplier_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="15"
-                            width="105">
-                        Distance Multiplier:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0.8"
-                            layout="topleft"
-                            left_pad="5"
-                            min_val="0.05"
-                            max_val="1000"
-                            name="distance_multip"
-                            top_delta="0"
-                            width="219"
-                            can_edit_text="true"/>
-                    <text
-                            name="maximum_altitude_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="15"
-                            width="105">
-                        Maximum Altitude:
-                    </text>
-                    <slider
-                            decimal_digits="1"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_pad="5"
-                            min_val="0"
-                            max_val="10000"
-                            name="max_alt"
-                            top_delta="0"
-                            width="219"
-                            can_edit_text="true"/>
-                            <text
-                            name="scene_gamma_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left="5"
-                            top_pad="15"
-                            width="105">
-                        Scene Gamma:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_pad="5"
-                            max_val="20"
-                            name="scene_gamma"
-                            top_delta="0"
-                            width="219"
-                            can_edit_text="true"/>
-                </layout_panel>            
-            </layout_stack>                
-        </layout_panel>
-    </layout_stack>
+	<panel
+	name="P_Atmos_Settings"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="95"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+		<text
+		name="ambient_color_label"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left="5"
+		top_pad="10"
+		width="55">
+		Ambient:
+		</text>
+				
+		<color_swatch
+		can_apply_immediately="true"
+		follows="left|top"
+		height="25"
+		label_height="0"
+		layout="topleft"
+		left_delta="55"
+		name="ambient_light"
+		top_delta="-5"
+		width="185" />
+				
+		<text
+		name="blue_horizon_label"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left="5"
+		top_pad="10"
+		width="55">
+		BluHrz:
+		</text>
+				
+		<color_swatch
+		can_apply_immediately="true"
+		follows="left|top"
+		height="25"
+		label_height="0"
+		layout="topleft"
+		left_delta="55"
+		name="blue_horizon"
+		top_delta="-5"
+		width="185" />
+			
+		<text
+		name="blue_density_label"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left="5"
+		top_pad="10"
+		width="55">
+		Blue Den:
+		</text>
+				
+		<color_swatch
+		can_apply_immediately="true"
+		follows="left|top"
+		height="25"
+		label_height="0"
+		layout="topleft"
+		left_delta="55"
+		name="blue_density"
+		top_delta="-5"
+		width="185" />
+	</panel>
+
+	<panel
+	name="P_Atmosphere_Header"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="22"
+	bg_alpha_color="EmphasisColor"
+	border_visible="true"
+	border_thickness="1"
+	background_visible="true">
+	
+		<text
+		name="T_Atmosphere_Header"
+		follows="left|top"
+		layout="topleft"
+		left="5"
+		font="SansSerif"
+		value="Atmosphere Settings"/>
+			
+	</panel>
+
+	<panel
+	name="P_Atmosphere_OtherSettings"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="115"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+		<text
+		name="haze_horizon_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		
+		width="50">
+		HazHoz:
+		</text>
+
+		<slider
+		decimal_digits="3"
+		follows="left|top"
+		height="16"
+		increment="0.001"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		min_val="0"
+		max_val="5"
+		name="haze_horizon"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+		
+		<text
+		name="haze_density_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		HazDen:
+		</text>
+		
+		<slider
+		decimal_digits="3"
+		follows="left|top"
+		height="16"
+		increment="0.001"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		min_val="0"
+		max_val="5"
+		name="haze_density"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+
+		<text
+		name="density_multiplier_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Density:
+		</text>
+		
+		<slider
+		decimal_digits="4"
+		follows="left|top"
+		height="16"
+		increment="0.0001"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		min_val="0.0001"
+		max_val="2"
+		name="density_multip"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+		
+		<text
+		name="distance_multiplier_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Distance Multiplier:
+		</text>
+		
+		<slider
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0.8"
+		layout="topleft"
+		left="55"
+		min_val="0.05"
+		max_val="1000"
+		name="distance_multip"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+		
+		<text
+		name="maximum_altitude_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		MaxAlt:
+		</text>
+		
+		<slider
+		decimal_digits="1"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		min_val="0"
+		max_val="10000"
+		name="max_alt"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+		
+		<text
+		name="scene_gamma_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Gamma:
+		</text>
+		
+		<slider
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.1"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		max_val="20"
+		name="scene_gamma"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+	</panel>
+
+	<panel
+	name="P_Rainbow_Header"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="22"
+	bg_alpha_color="EmphasisColor"
+	border_visible="true"
+	border_thickness="1"
+	background_visible="true">
+	
+		<text
+		name="T_Rainbow_Header"
+		follows="left|top"
+		layout="topleft"
+		left="5"
+		font="SansSerif"
+		value="Rainbow and Halo Settings"
+		width="250"/>
+		
+	</panel>
+	
+
+	<panel
+		name="P_Rainbow_OtherSettings"
+		follows="left|top"
+		layout="topleft"
+		top_pad="5"
+		left="0"
+		width="250"
+		height="60"
+		border_visible="true"
+		bevel_style="in"
+		background_visible="true">
+		
+		<text
+		name="moisture_level_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Moisture:
+		</text>
+		
+		<slider
+		decimal_digits="3"
+		follows="left|top"
+		height="16"
+		increment="0.001"
+		initial_value="0"
+		left="55"
+		left_pad="50"
+		layout="topleft"
+		min_val="0"
+		max_val="1"
+		name="moisture_level"
+		width="190"
+		can_edit_text="true"/>
+		
+		<text
+		name="droplet_radius_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Droplet:
+		</text>
+		
+		<slider
+		decimal_digits="3"
+		follows="left|top"
+		height="16"
+		increment="0.001"
+		initial_value="0"
+		left="55"
+		left_pad="50"
+		layout="topleft"
+		min_val="5.0"
+		max_val="1000.0"
+		name="droplet_radius"
+		width="190"
+		can_edit_text="true"/>
+		
+		<text
+		name="ice_level_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Ice Level:
+		</text>
+		
+		<slider
+		decimal_digits="3"
+		follows="left|top"
+		height="16"
+		increment="0.001"
+		initial_value="0"
+		left="55"
+		layout="topleft"
+		left_pad="50"
+		min_val="0"
+		max_val="1"
+		name="ice_level"
+		width="190"
+		can_edit_text="true"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 7fd7c063bf..6e5cc49e76 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -1,281 +1,418 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-        border="true"
-        follows="all"
-        label="Clouds"
-        layout="topleft"
-        left="0"
-        help_topic="land_general_tab"
-        name="panel_settings_sky_clouds"
-        top="0">
-    <layout_stack 
-            name="main_ls"
-            follows="all"
-            layout="topleft"
-            left="5"
-            top="5"
-            right="-5"
-            bottom="-5"
-            orientation="hoizontal">
-        <layout_panel
-                name="left_lp"
-                border="true"
-                bevel_style="in"
-                auto_resize="true"
-                user_resize="false"
-                visible="true"
-                height="75">
-            <text
-                    name="cloud_coverage_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left ="5"
-                    top="15"
-                    width="100">
-                Cloud Coverage:
-            </text>
-            <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
-                    min_val="0"
-                    max_val="1"
-                    name="cloud_coverage"
-                    top_delta="0"
-                    width="214"
-                    can_edit_text="true"/>
-            <text
-                    name="cloud_scale_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="5"
-                    top_delta="15"
-                    width="100">
-                Cloud Scale:
-            </text>
-            <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
-                    min_val="0.01"
-                    max_val="3"
-                    name="cloud_scale"
-                    top_delta="0"
-                    width="214"
-                    can_edit_text="true"/>
-            <text
-                    name="cloud_variance_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="5"
-                    top_delta="15"
-                    width="100">
-                Cloud Variance:
-            </text>
-            <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
-                    min_val="0"
-                    max_val="1.0"
-                    name="cloud_variance"
-                    top_delta="0"
-                    width="214"
-                    can_edit_text="true"/>
-            <text
-                    name="cloud_scroll_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="5"
-                    top_delta="25"
-                    width="200">
-                    Cloud Scroll:
-            </text>
-            <xy_vector
-            follows="left|top"
-                    name="cloud_scroll_xy"
-                    width="157"
-                    height="178"
-                    visible="true"
-                    left="5"
-                    top_delta="21"
-                    min_val_x="-30"
-                    max_val_x="30"
-                    min_val_y="-30"
-                    max_val_y="30" 
-                    logarithmic="1"/>
-                <text
-                    name="cloud_image_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="180"
-                    top_delta="-20"
-                    width="200">
-                    Cloud Image:
-                </text>
-                <texture_picker
-                height="123"
-                layout="topleft"
-                left_delta="5"
-                name="cloud_map"
-                top_pad="10"
-                width="100"/>
-                <text
-                        name="cloud_color_label"
-                        follows="left|top"
-                        height="10"
-                        layout="topleft"
-                        left_delta="-5"
-                        top_pad="5"
-                        width="80">
-                    Cloud Color:
-                </text>
-                <color_swatch
-                        can_apply_immediately="true"
-                        follows="left|top"
-                        height="25"
-                        label_height="0"
-                        layout="topleft"
-                        left_delta="5"
-                        name="cloud_color"
-                        top_pad="5"
-                        width="60" />                    
-        </layout_panel>
-                <layout_panel
-                name="right_lp"
-                border="true"
-                bevel_style="in"
-                auto_resize="true"
-                user_resize="false"
-                visible="true"
-                height="75">
-                <text
-                name="cloud_density_label"
-                follows="left|top"
-                height="10"
-                layout="topleft"
-                    left_delta="15"
-                    top_pad="15"
-                    width="200">
-                    Cloud Density:
-                </text>
-                <slider
-                label="X"
-                decimal_digits="2"
-                follows="left|top"
-                height="16"
-                increment="0.01"
-                initial_value="0"
-                layout="topleft"
-                left_delta="5"
-                    min_val="0"
-                    max_val="1"
-                    name="cloud_density_x"
-                    top_delta="20"
-                    width="200"
-                    can_edit_text="true"/>
-                    <slider
-                    label="Y"
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="0"
-                    min_val="0"
-                    max_val="1"
-                    name="cloud_density_y"
-                    top_delta="20"
-                    width="200"
-                    can_edit_text="true"/>
-            <slider
-                    label="D"
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="0"
-                    min_val="0"
-                    max_val="3"
-                    name="cloud_density_d"
-                    top_delta="20"
-                    width="200"
-                    can_edit_text="true"/>
-            <text
-                    name="cloud_detail_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="-5"
-                    top_delta="35"
-                    width="200">
-                Cloud Detail:
-            </text>
-            <slider
-                    label="X"
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="5"
-                    min_val="0"
-                    max_val="1"
-                    name="cloud_detail_x"
-                    top_delta="20"
-                    width="200"
-                    can_edit_text="true"/>
-            <slider
-                    label="Y"
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="0"
-                    min_val="0"
-                    max_val="1"
-                    name="cloud_detail_y"
-                    top_delta="20"
-                    width="200"
-                    can_edit_text="true"/>
-            <slider
-                    label="D"
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_delta="0"
-                    min_val="0"
-                    max_val="1"
-                    name="cloud_detail_d"
-                    top_delta="20"
-                    width="200"
-                    can_edit_text="true"/>
-        </layout_panel>
-    </layout_stack>
+border="true"
+follows="all"
+label="Clouds"
+layout="topleft"
+left="0"
+help_topic="land_general_tab"
+name="panel_settings_sky_clouds"
+top="0"
+>
+<!--layout_stack 
+name="main_ls"
+follows="all"
+layout="topleft"
+left="5"
+top="5"
+right="-5"
+bottom="-5"
+orientation="hoizontal">
+<layout_panel
+name="left_lp"
+border="true"
+bevel_style="in"
+auto_resize="true"
+user_resize="false"
+visible="true"
+height="75"-->
+
+
+	<panel
+	name="P_Clouds_Header"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="22"
+	bg_alpha_color="EmphasisColor"
+	border_visible="true"
+	border_thickness="1"
+	background_visible="true">
+
+		<text
+		name="T_Clouds_Header"
+		follows="left|top"
+		layout="topleft"
+		left="5"
+		font="SansSerif"
+		value="Cloud Settings"/>
+			
+	</panel>	
+
+	<panel
+	name="P_Atmos_Settings"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="35"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+		<text
+		name="cloud_color_label"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left="5"
+		top_pad="10"
+		width="50">
+		Color:
+		</text>
+
+		<color_swatch
+		can_apply_immediately="true"
+		follows="left|top"
+		height="25"
+		label_height="0"
+		layout="topleft"
+		left_delta="55"
+		name="cloud_color"
+		top_delta="-5"
+		width="185" /> 	
+
+	</panel>
+
+	<panel
+	name="P_Cloud_Density"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="60"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+	
+	
+		<text
+		name="cloud_coverage_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="55">
+		Cover:
+		</text>
+	
+		<slider
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		min_val="0"
+		max_val="1"
+		name="cloud_coverage"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+				
+		<text
+		name="cloud_scale_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Scale:
+		</text>
+
+		<slider
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		min_val="0.01"
+		max_val="3"
+		name="cloud_scale"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+
+		<text
+		name="cloud_variance_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Variance:
+		</text>
+
+		<slider
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="55"
+		min_val="0"
+		max_val="1.0"
+		name="cloud_variance"
+		left_pad="50"
+		width="190"
+		can_edit_text="true"/>
+		
+	</panel>
+
+	<panel
+	name="P_Cloud_Density"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="80"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+		<text
+		type="string"
+		length="1"
+		follows="left|top"
+		font="SansSerif"
+		height="16"
+		layout="topleft"
+		left="5"
+		name="cloud_density_label"
+		top_pad="5"
+		tool_tip="Cloud XY/Density - Use the X and Y sliders to change the horizontal position of all clouds in the sky. The D slider affects the overall density of the individual clouds; at low settings you will see thin, wispy clouds, and at higher settings you will see thicker, more solid clouds."
+		width="240">
+		Cloud XY/Density
+		</text>
+
+		<slider
+		label="X"
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="5"
+		min_val="0"
+		max_val="1"
+		name="cloud_density_x"
+		top_pad="2"
+		width="240"
+		can_edit_text="true"/>
+
+		<slider
+		label="Y"
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="5"
+		min_val="0"
+		max_val="1"
+		name="cloud_density_y"
+		top_pad="2"
+		width="240"
+		can_edit_text="true"/>
+
+		<slider
+		label="D"
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="5"
+		min_val="0"
+		max_val="3"
+		name="cloud_density_d"
+		top_delta="20"
+		width="240"
+		can_edit_text="true"/>
+
+	</panel>
+
+	<panel
+	name="P_Cloud_Detail"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="80"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+		<text
+		type="string"
+		length="1"
+		follows="left|top"
+		font="SansSerif"
+		height="16"
+		layout="topleft"
+		left="5"
+		name="cloud_detail_label"
+		top_pad="5"
+		tool_tip="Cloud XY/Density - Use the X and Y sliders to change the horizontal position of all clouds in the sky. The D slider affects the overall density of the individual clouds; at low settings you will see thin, wispy clouds, and at higher settings you will see thicker, more solid clouds."
+		width="240">
+		Cloud XY/Detail
+		</text>
+
+
+		<slider
+		label="X"
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left="5"
+		min_val="0"
+		max_val="1"
+		name="cloud_detail_x"
+		top_pad="2"
+		width="240"
+		can_edit_text="true"/>
+
+		<slider
+		label="Y"
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left_delta="0"
+		min_val="0"
+		max_val="1"
+		name="cloud_detail_y"
+		top_delta="20"
+		width="240"
+		can_edit_text="true"/>
+
+		<slider
+		label="D"
+		decimal_digits="2"
+		follows="left|top"
+		height="16"
+		increment="0.01"
+		initial_value="0"
+		layout="topleft"
+		left_delta="0"
+		min_val="0"
+		max_val="1"
+		name="cloud_detail_d"
+		top_delta="20"
+		width="240"
+		can_edit_text="true"/>	
+		
+	</panel>
+
+	<panel	
+	name="P_Cloud_Scroll"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="105"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+	
+		<text
+		name="cloud_scroll_label"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left="5"
+		top_pad="5"
+		width="40">
+		Scroll:
+		</text>
+
+		<text
+		name="cloud_image_label"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left_pad="90"
+		top_delta="0"
+		width="50">
+		Image:
+		</text>
+
+		<xy_vector
+		follows="left|top"
+		name="cloud_scroll_xy"
+		width="110"
+		height="80"
+		visible="true"
+		left="5"
+		top_pad="5"
+		min_val_x="-30"
+		max_val_x="30"
+		min_val_y="-30"
+		max_val_y="30" 
+		logarithmic="1"/>
+
+		<texture_picker
+		height="100"
+		layout="topleft"
+		left_pad="20"
+		name="cloud_map"
+		top_delta="0"
+		width="110"/>
+	
+		
+<!--
+		<text
+		name="cloud_image_label"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left_pad="3"
+		top_delta="0"
+		width="50">
+		Image:
+		</text>
+-->
+
+		<!--/layout_panel>
+		<layout_panel
+		name="right_lp"
+		border="true"
+		bevel_style="in"
+		auto_resize="true"
+		user_resize="false"
+		visible="true"
+		height="75"-->
+		<!--/layout_panel>
+		</layout_stack-->
+	
+	</panel>
 </panel>                
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index ef33ca419c..4298aa77d4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -5,9 +5,10 @@
         label="Sun &amp; Moon"
         layout="topleft"
         left="0"
-        name="panel_settings_sky_hbodies"
+		height="405"
+		name="panel_settings_sky_hbodies"
         top="0">
-    <layout_stack 
+    <!--layout_stack 
             name="main_ls"
             follows="all"
             layout="topleft"
@@ -23,8 +24,8 @@
                 user_resize="false"
                 visible="true"
                 name="sun_layout"
-                height="400">
-            <text
+                height="400"-->
+            <!--text
                     name="sun_stars_label"
                     follows="left|top"
                     height="10"
@@ -34,74 +35,51 @@
                     font="SansSerifBold"
                     width="120">
                 Sun &amp; Stars
-            </text>
-            <check_box
-                    control_name="sunbeacon"
-                    width="60"
-                    height="16"
-                    label="Show Beacon"
-                    layout="topleft"
-                    name="sunbeacon" 
-                    top_delta="0"
-                    left="180"/>  
-            <text
-                    name="position_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="20"
-                    top_delta="20"
-                    width="100">
-                Position:
-            </text>
-            <sun_moon_trackball
-                    name="sun_rotation"
-                    follows="left|top"
-                    left_delta="0"
-                    top_delta="15"
-                    height="150"
-                    width="150"
-                    thumb_mode="sun" />
-            <text
-                    name="image_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left_delta="160"
-                    top_delta="-15"
-                    width="200">
-                Image and scale:
-            </text>
-            <texture_picker
-                    height="123"
-                    layout="topleft"
-                    left_delta="5"
-                    name="sun_image"
-                    top_pad="5"
-                    width="100"/>
-            <slider_bar
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="100"
-                    top_delta="0"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
-                    min_val="0.25"
-                    max_val="20"
-                    name="sun_scale"
-                    orientation="vertical"
-                    width="16"
-                    can_edit_text="false"/>
-            <text
+            </text-->
+			
+<panel
+	name="P_Sun_Color"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="22"
+	bg_alpha_color="EmphasisColor"
+	border_visible="true"
+	border_thickness="1"
+	background_visible="true">
+	
+		<text
+		name="T_Sun_Header"
+		follows="left|top"
+		layout="topleft"
+		left="5"
+		font="SansSerif"
+		value="Sun &amp; Moon Color"/>
+			
+	</panel>		
+	
+	<panel
+	name="P_Atmos_Settings"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="30"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+			 <text
                     name="color_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left="180"
+                    left="5"
                     top_pad="5"
-                    width="80">
+                    width="50">
                 Color:
             </text>
             <color_swatch
@@ -110,131 +88,264 @@
                     height="25"
                     label_height="0"
                     layout="topleft"
-                    left_delta="5"
+                    left_delta="55"
                     name="sun_moon_color"
-                    top_pad="5"
-                    width="60" />
-          <text
-            follows="left|top"
-            name="sun_azimuth_label"
-            height="10"
-            layout="topleft"
-            left="20"
-            top_delta="45"
-            width="90">
-            Azimuth:
-          </text>
-          <slider
-            decimal_digits="2"
-            follows="left|top"
-            height="16"
-            increment="0.01"
-            initial_value="0"
-            layout="topleft"
-            left_pad="5"
-            min_val="0"
-            max_val="359.99"
-            name="sun_azimuth"
-            top_delta="0"
-            width="215"
-            can_edit_text="true"/>
-          <text
-            follows="left|top"
-            name="sun_elevation_label"
-            height="10"
-            layout="topleft"
-            left="20"
-            top_delta="22"
-            width="90">
-            Elevation:
-          </text>
-          <slider
-            decimal_digits="2"
-            follows="left|top"
-            height="16"
-            increment="0.01"
-            initial_value="0"
-            layout="topleft"
-            left_pad="5"
-            min_val="-90"
-            max_val="90"
-            name="sun_elevation"
-            top_delta="0"
-            width="215"
-            can_edit_text="true"/>
-            <text
-                    name="glow_focus_label"
+                    top_delta="-5"
+                    width="185" />
+					
+</panel>
+
+<panel
+	name="P_Sun_Header"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="22"
+	bg_alpha_color="EmphasisColor"
+	border_visible="true"
+	border_thickness="1"
+	background_visible="true">
+	
+		<text
+		name="T_Sun_Header"
+		follows="left|top"
+		layout="topleft"
+		left="5"
+		font="SansSerif"
+		value="Sun Settings"/>
+			
+	</panel>	
+
+	<panel
+	name="P_Sun_Setting"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="145"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+            <!--text
+                    name="position_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
                     left="20"
-                    top_delta="22"
-                    width="90">
-                Glow Focus:
+                    top_delta="20"
+                    width="100">
+                Position:
+            </text-->
+            <!--sun_moon_trackball
+                    name="sun_rotation"
+                    follows="left|top"
+                    left_delta="0"
+                    top_delta="15"
+                    height="150"
+                    width="150"
+                    thumb_mode="sun" /-->
+            <text
+                    name="image_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="5"
+                    top_pad="5"
+                    width="200">
+                Image:
             </text>
+			
+			<check_box
+                    control_name="sunbeacon"
+                    width="60"
+                    height="16"
+                    label="Show Beacon"
+                    layout="topleft"
+                    name="sunbeacon" 
+                    top_delta="0"
+                    left_delta="145"/> 
+					
+            <texture_picker
+                    height="83"
+                    layout="topleft"
+                    left="5"
+                    name="sun_image"
+                    top_pad="0"
+                    width="60"/>
+					
+					
+			
+			<slider
+                    label="Scale:"
+					decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    top_delta="8"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left="70"
+                    min_val="0.25"
+                    max_val="20"
+                    name="sun_scale"
+                    width="175"
+                    can_edit_text="true"/>
+					
+            <text
+                    name="glow_focus_label"
+					follows="left|top"
+					height="15"
+					layout="topleft"
+					left="70"
+					width="50">
+                Focus:
+            </text>		
+			
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
+					layout="topleft"
+                    left="110"
                     min_val="-2"
                     max_val="2"
                     name="glow_focus"
-                    top_delta="0"
-                    width="215"
+                    left_pad="20"
+                    width="135"
                     can_edit_text="true"/>
-            <text
-                    name="glow_size_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="20"
-                    top_delta="22"
-                    width="90">
-                Glow Size:
-            </text>
+					
+		<text
+		name="glow_size_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="70"
+		width="50">
+		Size:
+		</text>
+			
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
+					layout="topleft"
+                    left="110"
                     min_val="0"
                     max_val="1.99"
                     name="glow_size"
-                    top_delta="0"
-                    width="215"
+                    left_pad="2"
+                    width="135"
                     can_edit_text="true"/>
-            <text
-                    name="star_brightness_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="20"
-                    top_delta="22"
-                    width="90">
-                Star Brightness:
-            </text>
+           
+		<text
+		name="sun_azimuth_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Azimuth:
+		</text>
+		
+			  <slider
+				decimal_digits="2"
+				follows="left|top"
+				height="16"
+				increment="0.01"
+				initial_value="0"
+				layout="topleft"
+				left="55"
+				min_val="0"
+				max_val="359.99"
+				name="sun_azimuth"
+				left_pad="2"
+				width="190"
+				can_edit_text="true"/>
+				
+			<text
+			name="sun_elevation_label"
+			follows="left|top"
+			height="15"
+			layout="topleft"
+			left="5"
+			width="50">
+			Elevation:
+			</text>
+			
+			  <slider
+				decimal_digits="2"
+				follows="left|top"
+				height="16"
+				increment="0.01"
+				initial_value="0"
+				layout="topleft"
+				left="55"
+				min_val="-90"
+				max_val="90"
+				name="sun_elevation"
+				left_pad="2"
+				width="190"
+				can_edit_text="true"/>
+
+		<text
+		name="star_brightness_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Star Brt:
+		</text>
+		
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
+					layout="topleft"
+                    left="55"
                     min_val="0"
                     max_val="500"
                     name="star_brightness"
-                    top_delta="0"
-                    width="215"
-                    can_edit_text="true"/>                    
-        </layout_panel>
+                    left_pad="2"
+                    width="190"
+                    can_edit_text="true"/>     
+</panel>
+
+<panel
+	name="P_Moon_Header"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="22"
+	bg_alpha_color="EmphasisColor"
+	border_visible="true"
+	border_thickness="1"
+	background_visible="true">
+
+		<text
+		name="T_Moon_Header"
+		follows="left|top"
+		layout="topleft"
+		left="5"
+		font="SansSerif"
+		value="Moon Settings"/>
+		
+</panel>
+
+					
+        <!--/layout_panel>
         <layout_panel
                 name="moon_layout"
                 border="true"
@@ -242,8 +353,8 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="400">
-                <text
+                height="400"-->
+                <!--text
                         name="moon_label"
                         follows="left|top"
                         height="10"
@@ -253,17 +364,9 @@
                         font="SansSerifBold"
                         width="120">
                 Moon
-                </text>
-                <check_box
-                        control_name="moonbeacon"
-                        width="60"
-                        height="16"
-                        label="Show Beacon"
-                        layout="topleft"
-                        name="moonbeacon" 
-                        top_delta="0"
-                        left="180"/>  
-                <text
+                </text-->
+
+                <!--text
                         name="position_label"
                         follows="left|top"
                         height="10"
@@ -280,111 +383,143 @@
                             top_delta="15"
                             height="150"
                             width="150"
-                            thumb_mode="moon" />
+                            thumb_mode="moon" /-->
+	<panel
+	name="P_Moon_Setting"
+	follows="left|top"
+	layout="topleft"
+	top_pad="5"
+	left="0"
+	width="250"
+	height="125"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">							
+							
                     <text
                             name="moon_image_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="160"
-                            top_delta="-15"
+                            left="5"
+                            top_pad="5"
                             width="200">
-                        Image and scale:
+                        Image:
                     </text>
+					
+					<check_box
+                        control_name="moonbeacon"
+                        width="60"
+                        height="16"
+                        label="Show Beacon"
+                        layout="topleft"
+                        name="moonbeacon" 
+                        top_delta="0"
+                        left="145"/>  
+						
                     <texture_picker
-                            height="123"
+                            height="83"
                             layout="topleft"
-                            left_delta="5"
+                            left="5"
                             name="moon_image"
-                            top_pad="10"
-                            width="100"/>
-                    <slider_bar
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="100"
-                            top_delta="0"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_pad="5"
-                            min_val="0.25"
-                            max_val="20"
-                            name="moon_scale"
-                            orientation="vertical"
-                            width="16"
-                            can_edit_text="false"/>
-                  <text
-                    follows="left|top"
-                    name="moon_azimuth_label"
-                    height="10"
-                    layout="topleft"
-                    left="20"
-                    top_delta="160"
-                    width="90">
-                    Azimuth:
-                  </text>
+                            top_pad="2"
+                            width="60"/>		
+							
+			  
+					<slider
+					label="Scale:"
+					decimal_digits="2"
+					follows="left|top"
+					height="16"
+					top_delta="27"
+					increment="0.01"
+					initial_value="0"
+					layout="topleft"
+					left="75"
+					min_val="0.25"
+					max_val="20"
+					name="moon_scale"
+					width="170"
+					can_edit_text="true"/>
+					
+		<text
+		name="brightness_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="70"
+		width="50">
+		Bright:
+		</text>
+		
                   <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
-                    min_val="0"
-                    max_val="359.99"
-                    name="moon_azimuth"
-                    top_delta="0"
-                    width="215"
-                    can_edit_text="true"/>
-                  <text
-                    follows="left|top"
-                    name="moon_elevation_label"
-                    height="10"
-                    layout="topleft"
-                    left="20"
-                    top_delta="22"
-                    width="90">
-                    Elevation:
-                  </text>
-                  <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
-                    min_val="-90"
-                    max_val="90"
-                    name="moon_elevation"
-                    top_delta="0"
-                    width="215"
-                    can_edit_text="true"/>
-                  <text
-                    name="brightness_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="20"
-                    top_delta="22"
-                    width="90">
-                    Brightness:
-                  </text>
-                  <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left_pad="5"
+					layout="topleft"
+                    left="110"
                     min_val="0.0"
                     max_val="1.0"
                     name="moon_brightness"
-                    top_delta="0"
-                    width="215"
-                    can_edit_text="true"/>                           
-        </layout_panel>
-    </layout_stack>
+					left_pad="10"
+                    width="135"
+                    can_edit_text="true"/>     
+			
+
+		<text
+		name="moon_azimuth_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Azimuth:
+		</text>			
+				  
+                  <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+					
+                    layout="topleft"
+                    left="55"
+                    min_val="0"
+                    max_val="359.99"
+                    name="moon_azimuth"
+                    left_pad="2"
+                    width="190"
+                    can_edit_text="true"/>
+		<text
+		name="moon_elevation_label"
+		follows="left|top"
+		height="15"
+		layout="topleft"
+		left="5"
+		width="50">
+		Elevation:
+		</text>
+                  <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left="55"
+                    min_val="-90"
+                    max_val="90"
+                    name="moon_elevation"
+                    left_pad="2"
+                    width="190"
+                    can_edit_text="true"/>
+
+
+</panel>
+					
+        <!--/layout_panel>
+    </layout_stack-->
 </panel>                
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 1a763859f2..f08d4d1fd4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -2,27 +2,59 @@
 <panel
         border="true"
         follows="all"
+		height="440"
+		width="250"
         label="Water"
         layout="topleft"
         left="0"
         name="panel_settings_water"
         top="0">    
-    <layout_stack name="water_stack1"
-            follows="all"
-            layout="topleft"
-            left="5"
-            top="5"
-            right="-5"
-            bottom="-5"
-            orientation="vertical">
-        <layout_panel
-                name="lp_top"
-                border="true"
-                bevel_style="in"
-                auto_resize="false"
-                user_resize="false"
-                visible="true"
-                height="105">
+		
+<!--
+
+<layout_stack name="water_stack1"
+follows="all"
+layout="topleft"
+left="5"
+top="5"
+right="-5"
+bottom="-5"
+orientation="vertical">
+<layout_panel
+name="lp_top"
+border="true"
+bevel_style="in"
+auto_resize="false"
+user_resize="false"
+visible="true"
+height="105">
+
+-->
+
+<!--tab_container
+enabled="true"
+follows="left|top"
+height="275"
+left="0"
+width="250"
+top_pad="0"
+tab_position="top"-->
+
+	<panel
+	name="P_Wave_Fog"
+	label="Fog"
+	follows="left|top"
+	layout="topleft"
+	top_pad="0"
+	left="0"
+	width="250"
+	height="70"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+<!--
+ 
             <text
                     name="water_fog_label"
                     follows="left|top"
@@ -30,7 +62,7 @@
                     font="SansSerif"
                     layout="topleft"
                     left="5"
-                    top="5"
+                    top_pad="5"
                     width="215">
                 Water Fog:
             </text>
@@ -39,111 +71,203 @@
                     follows="left|top"
                     height="10"
                     layout="left|top"
-                    left_delta="15"
-                    top_delta="0"
+                    left="5"
+                    top_pad="5"
                     width="60">
                 Color:
             </text>
-            <color_swatch
-                    can_apply_immediately="true"
-                    follows="left|top"
-                    height="37"
-                    label_height="0"
-                    layout="topleft"
-                    left_delta="0"
-                    name="water_fog_color"
-                    top_pad="5"
-                    width="60" />
+
+-->			
+
+				<color_swatch
+				 can_apply_immediately="true"
+				 follows="left|top"
+				 height="40"
+				 label_height="0"
+				 layout="topleft"
+				 left="20"
+				 name="water_fog_color"
+				 top_pad="5"
+				 width="90"/>
+				 
+				 <texture_picker
+				 height="60"
+				 layout="topleft"
+				 left_pad="40"
+				 name="water_normal_map"
+				 top_delta="0"
+				 width="60"/>
+				
+				<text
+				 follows="top|left"
+				 height="20"
+				 font="SansSerifSmall"
+				 layout="topleft"
+				 left="20"
+				 name="water_fog_label"
+				 top_pad="-13"
+				 width="110"
+				 tool_tip="Water Fog Color - This changes the color of the volume tint of the water, essentially defining the color of the water itself. If your water has no fog, it will appear crystal clear and colorless."
+				 word_wrap="true">
+					Water Fog Color
+				</text>
+				
+				<text
+				 follows="left|top|right"
+				 font="SansSerifSmall"
+				 height="20"
+				 layout="topleft"
+				 left_pad="20"
+				 name="normal_map_label"
+				 top_delta="0"
+				 tool_tip="Normal Map - Image used for determining reflections and refractions. Any texture may be used for this setting- but true normal maps work best. Try snake skin, tiles, or any other normal map for some wacky effects!"
+				 width="100">
+					Normal Map
+				</text>
+
+
+
+</panel>
+
+
+	<panel
+	name="P_Wave_Fog"
+	label="Fog"
+	follows="left|top"
+	layout="topleft"
+	top_pad="0"
+	left="0"
+	width="250"
+	height="80"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+
+
+					
             <text
-                    name="density_exponent_label"
-                    follows="left|top"
-                    height="10"
-                    top_delta="-15"
-                    left_delta="80"
-                    width="150">
-                Density Exponent:
+			name="density_exponent_label"
+			follows="left|top"
+			height="15"
+			layout="topleft"
+			left="5"
+			width="50">
+			Density:
             </text>
+
             <slider
                     decimal_digits="1"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-                    layout="top"
-                    left_delta="15"
+					layout="topleft"
+                    left="55"
                     min_val="-10"
                     max_val="10"
                     name="water_fog_density"
-                    top_delta="5"
-                    width="150"
+                    left_pad="5"
+                    width="190"
                     can_edit_text="true"/>
-            <text
-                    name="underwater_modifier_label"
-                    follows="left|top"
-                    height="10"
-                    top_delta="25"
-                    left_delta="-15"
-                    width="150">
-                Underwater Modifier:</text>
+		
+					
+			<text
+			name="underwater_modifier_label"
+			follows="left|top"
+			height="15"
+			layout="topleft"
+			left="5"
+			width="50">
+			Modifier:</text>
+	
+				
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-                    layout="top"
-                    left_delta="15"
+				    layout="topleft"
+                    left="55"
                     min_val="0.0"
                     max_val="20.0"
                     name="water_underwater_mod"
-                    top_delta="20"
-                    width="150"
+                    left_pad="5"
+                    width="190"
                     can_edit_text="true"/>
-                    
-                    <text
-                            follows="left|top|right"
-                            height="10"
-                            layout="topleft"
-                            left_delta="165"
-                            name="FresnelScaleText"
-                            top_delta="-53"
-                            width="150">
-                        Fresnel Scale:
-                    </text>
+					
+                   
+			<text
+			name="FresnelScaleText"
+			follows="left|top"
+			height="15"
+			layout="topleft"
+			left="5"
+			width="50">
+			Fres. Scale:
+			</text>
+
+
                     <slider
                             decimal_digits="2"
                             follows="left|top"
                             height="16"
                             increment="0.01"
                             initial_value="0.7"
-                            layout="topleft"
-                            left_delta="5"
+						    layout="topleft"
+                            left="55"
                             name="water_fresnel_scale"
-                            top_delta="15"
-                            width="150"
+                            left_pad="5"
+                            width="190"
                             can_edit_text="true"/>
-                    <text
-                            follows="left|top|right"
-                            layout="topleft"
-                            left_delta="-5"
-                            name="FresnelOffsetText"
-                            top_delta="25"
-                            width="150">
-                        Fresnel Offset:
-                    </text>
+							
+
+							
+			<text
+			name="FresnelOffsetText"
+			follows="left|top"
+			height="15"
+			layout="topleft"
+			left="5"
+			width="50">
+			Fres. Offset:
+			</text>
+
+					
                     <slider
                             decimal_digits="2"
                             follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
                             height="16"
-                            layout="topleft"
-                            left_delta="5"
+						    layout="topleft"
+                            left="55"
                             name="water_fresnel_offset"
-                            top_pad="5"
-                            width="150"
+                            left_pad="5"
+                            width="190"
                             can_edit_text="true"/>
-                    
+ 
+
+
+
+	</panel>
+ 
+	<panel
+	name="P_Water_Wave"
+	follows="left|top"
+	label="Wave"
+	layout="topleft"
+	top_pad="0"
+	left="0"
+	width="250"
+	height="210"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">	 
+
+	
+<!--
+					
         </layout_panel>
         <layout_panel
                 name="lp_bottom"
@@ -166,23 +290,10 @@
                         visible="true"
                         min_width="460"
                         width="50">
-                    <text
-                            name="normal_map_label"
-                            follows="left|top|right"
-                            height="16"
-                            layout="topleft"
-                            left="15"
-                            top="5"
-                            width="215">
-                        Normal Map
-                    </text>
-                    <texture_picker
-                            height="84"
-                            layout="topleft"
-                            left_delta="0"
-                            name="water_normal_map"
-                            top_pad="5"
-                            width="61"/>
+						
+-->
+
+
 
                     <text
                             name="large_wave_speed_label"
@@ -190,18 +301,29 @@
                             height="16"
                             width="120"
                             layout="topleft"
-                            top_delta="-20"
-                            left_delta="175">
+                            top_pad="5"
+                            left="5">
                         Large Wave Speed
                     </text>
+				
+					<text
+                            name="small_wave_speed_label"
+                            follows="left|top"
+                            height="16"
+                            layout="topleft"
+                            top_delta="0"
+                            left_pad="5">
+                        Small Wave Speed
+                    </text>
+					
                     <xy_vector
                         follows="top|left"
                         name="water_wave1_xy"
-                        width="120"
-                        height="145"
+                        width="100"
+                        height="105"
                         visible="true"
-                        left_delta="0"
-                        top_delta="20"
+                        left="5"
+                        top_pad="0"
                         min_val_x="-20"
                         max_val_x="20"
                         increment_x="0.01f"
@@ -210,23 +332,14 @@
                         increment_y="0.01f"
                         arrow_color="white"/>
                     
-                    <text
-                            name="small_wave_speed_label"
-                            follows="left|top"
-                            height="16"
-                            layout="topleft"
-                            top_delta="-20"
-                            left_delta="140">
-                        Small Wave Speed
-                    </text>
                     <xy_vector
                         follows="top|left"
                         name="water_wave2_xy"
-                        width="120"
-                        height="145"
+                        width="100"
+                        height="105"
                         visible="true"
-                        left_delta="0"
-                        top_delta="20"
+                        left_pad="25"
+                        top_delta="0"
                         min_val_x="-20"
                         max_val_x="20"
                         min_val_y="-20"
@@ -241,7 +354,7 @@
                             height="16"
                             layout="topleft"
                             left="10"
-                            top="90"
+                            top_pad="5"
                             width="215">
                         Reflection Wavelet Scale
                     </text>
@@ -253,11 +366,11 @@
                             initial_value="0.7"
                             layout="topleft"
                             label="X:"
-                            left_delta="10"
+                            left="5"
                             max_val="10"
                             name="water_normal_scale_x"
-                            top_pad="5"
-                            width="150"
+                            top_pad="0"
+                            width="240"
                             can_edit_text="true"/>
                     <slider
                             decimal_digits="1"
@@ -266,11 +379,12 @@
                             initial_value="0.7"
                             height="16"
                             layout="topleft"
+							left="5"
                             max_val="10"
                             name="water_normal_scale_y"
-                            top_pad="6"
+                            top_pad="5"
                             label="Y:"
-                            width="150"
+                            width="240"
                             can_edit_text="true"/>
                     <slider
                             decimal_digits="1"
@@ -279,13 +393,16 @@
                             initial_value="0.7"
                             height="16"
                             layout="topleft"
+							left="5"
                             max_val="10"
                             name="water_normal_scale_z"
-                            top_pad="6"
+                            top_pad="5"
                             label="Z:"
-                            width="150"
+                            width="240"
                             can_edit_text="true"/>                            
-                        
+
+<!--
+           
                 </layout_panel>
                 <layout_panel
                         name="lp_right"
@@ -295,6 +412,30 @@
                         user_resize="false"
                         width="50"
                         visible="true">
+						
+-->
+
+
+
+	</panel>
+
+	<panel
+	name="P_Water_Reflection"
+	label="Refraction"
+	follows="left|top"
+	layout="topleft"
+	top_pad="0"
+	left="0"
+	width="250"
+	height="70"
+	border_visible="true"
+	bevel_style="in"
+	background_visible="true">
+	
+	
+
+
+<!--
                     <text
                             name="refraction_and_blur_label"
                             follows="left|top"
@@ -302,20 +443,23 @@
                             font="SansSerif"
                             layout="topleft"
                             left="5"
-                            top="5"
+                            top_pad="5"
                             width="215">
                         Refraction And Blur:
                     </text>
-                    <text
-                            name="refraction_scale_above_label"
-                            follows="left|top|right"
-                            height="16"
-                            layout="topleft"
-                            top_delta="25"
-                            left_delta="5"
-                            width="215">
-                        Refraction Scale (Above)
-                    </text>
+					
+-->
+					
+			<text
+			name="refraction_scale_above_label"
+			follows="left|top"
+			height="15"
+			layout="topleft"
+			left="5"
+			width="100">
+			Refract Above:
+			</text>
+				
                     <slider
                             control_name="water_scale_above"
                             decimal_digits="2"
@@ -323,26 +467,28 @@
                             increment="0.01"
                             initial_value="0.1"
                             height="16"
-                            layout="topleft"
-                            left_delta="5"
+							layout="topleft"
+                            left="95"
                             min_val="0"
                             max_val="3"
                             name="water_scale_above"
-                            top_pad="5"
-                            width="200"
+                            left_pad="5"
+                            width="150"
                             can_edit_text="true" />
-                    <text
+                    
+
+					
+					<text
                             name="refraction_scale_below_label"
-                            type="string"
-                            length="1"
-                            follows="left|top|right"
-                            height="16"
-                            layout="topleft"
-                            left_delta="-5"
-                            top_pad="5"
-                            width="215">
-                        Refraction Scale (Below)
+							follows="left|top"
+							height="15"
+							layout="topleft"
+							left="5"
+							width="100">
+                        Refract Below:
                     </text>
+
+					
                     <slider
                             control_name="water_scale_below"
                             decimal_digits="2"
@@ -350,41 +496,54 @@
                             height="16"
                             increment="0.01"
                             initial_value="0"
-                            layout="topleft"
-                            left_delta="5"
+						    layout="topleft"
+                            left="95"
                             min_val="0"
                             max_val="3"
                             name="water_scale_below"
-                            top_pad="5"
-                            width="200"
+                            left_pad="5"
+                            width="150"
                             can_edit_text="true"/>
-                    <text
-                            name="blur_multiplier_label"
-                            follows="left|top|right"
-                            font="SansSerif"
-                            height="16"
-                            layout="topleft"
-                            left_delta="-5"
-                            top_pad="5"
-                            width="215">
-                        Blur Multiplier
-                    </text>
+							
+		
+							
+				<text
+				name="blur_multiplier_label"
+				follows="left|top"
+				height="15"
+				layout="topleft"
+				left="5"
+				width="100">
+				Blur Multiplier
+				</text>
+					
+
+				
                     <slider
                             control_name="water_blur_multip"
                             follows="left|top"
                             height="16"
                             increment="0.001"
                             initial_value="0"
-                            layout="topleft"
-                            left_delta="5"
+						    layout="topleft"
+                            left="95"
                             min_val="-0.5"
                             max_val="0.5"
                             name="water_blur_multip"
-                            top_pad="5"
-                            width="200"
+                            left_pad="5"
+                            width="150"
                             can_edit_text="true"/>
+
+	</panel>
+						
+						
+<!--
+							
                 </layout_panel>
             </layout_stack>
         </layout_panel>
     </layout_stack>
+	
+-->	
+
 </panel>     

From 23863676d76792bafdb7966c6ead59afb3e77433 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 13 Nov 2022 14:32:56 +0000
Subject: [PATCH 06/22] [FIRE-32414][BUG-232911][FIRE-32411] revert material
 shader changes

Reverting this shader file avoids the side-effects such as emissive mask alpha fail, and materials not working on certain transparent objects.
It also fixes the MAC ALM issue which was casued by MAC OpenGL being too lame to compile the previous emissive/alpha fix.
---
 .../shaders/class1/deferred/materialF.glsl         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 1280bc20a8..f18f4da640 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -202,7 +202,7 @@ VARYING vec2 vary_texcoord2;
 uniform float env_intensity;
 uniform vec4 specular_color;  // specular color RGB and specular exponent (glossiness) in alpha
 
-#ifdef HAS_ALPHA_MASK
+#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_MASK)
 uniform float minimum_alpha;
 #endif
 
@@ -227,12 +227,11 @@ void main()
     vec4 diffcol = texture2D(diffuseMap, vary_texcoord0.xy);
 	diffcol.rgb *= vertex_color.rgb;
 
-#if HAS_ALPHA_MASK && (DIFFUSE_ALPHA_MODE != DIFFUSE_ALPHA_MODE_EMISSIVE)
-#if DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND
-    if (diffcol.a*vertex_color.a < minimum_alpha)
-#else
-    if (diffcol.a < minimum_alpha)
-#endif
+#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_MASK)
+
+    // Comparing floats cast from 8-bit values, produces acne right at the 8-bit transition points
+    float bias = 0.001953125; // 1/512, or half an 8-bit quantization
+    if (diffcol.a < minimum_alpha-bias)
     {
         discard;
     }
@@ -451,4 +450,3 @@ void main()
     frag_data[2] = final_normal; // XY = Normal.  Z = Env. intensity.
 #endif
 }
-

From ef917cd5dea5bd8f8856509e0d90ee465eca4360 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 13 Nov 2022 21:18:44 +0100
Subject: [PATCH 07/22] FIRE-32407 Russian translation update (minimap menu),
 by Romka Swallowtail

---
 .../skins/default/xui/ru/menu_mini_map.xml        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/ru/menu_mini_map.xml b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
index 5453db6388..7af4a9f1d0 100644
--- a/indra/newview/skins/default/xui/ru/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
@@ -40,10 +40,10 @@
 	<menu_item_call label="Начать отслеживание" name="Start Tracking"/>
 	<menu_item_call label="Прекратить отслеживание" name="Stop Tracking"/>
 	<menu label="Приближение" name="Minimap Zoom">
-		<menu_item_call label="Сильное" name="Zoom Close"/>
-		<menu_item_call label="Среднее" name="Zoom Medium"/>
-		<menu_item_call label="Слабое" name="Zoom Far"/>
-		<menu_item_call label="По умолчанию" name="Zoom Default"/>
+		<menu_item_check label="Очень близко" name="Zoom very close"/>
+		<menu_item_check label="Близко" name="Zoom close"/>
+		<menu_item_check label="Среднее (По умолчанию)" name="Zoom medium"/>
+		<menu_item_check label="Далеко" name="Zoom far"/>
 	</menu>
 	<menu label="Показать" name="Minimap Show">
 		<menu_item_check label="Объекты" name="Objects"/>
@@ -55,14 +55,17 @@
 		<menu_item_check label="Текстуры земли" name="Terrain Textures"/>
 		<menu_item_check label="Текстуры карты мира" name="World Map Textures"/>
 	</menu>
-	<menu_item_check label="Повернуть карту" name="Rotate Map"/>
-	<menu_item_check label="Автоцентрирование" name="Auto Center"/>
+	<menu_item_check label="Север вверху" name="North at top"/>
+	<menu_item_check label="Камера вверху" name="Camera at top"/>
+	<menu_item_check label="Автоцентрирование карты" name="Auto-center map"/>
+	<menu_item_call label="Отцентровать карту" name="Re-center map"/>
 	<menu label="Кольца покрытия чата" name="Chat Distance Rings Menu">
 		<menu_item_check label="Показать Кольца дистанций" name="Chat Distance Rings"/>
 		<menu_item_check label="Показать Кольцо дистанции Шепота" name="Whisper Distance Ring"/>
 		<menu_item_check label="Показать Кольцо дистанции Чата" name="Chat Distance Ring"/>
 		<menu_item_check label="Показать Кольцо дистанции Крика" name="Shout Distance Ring"/>
 	</menu>
+	<menu_item_call label="О земле" name="About Land"/>
 	<menu_item_call label="Профиль места" name="Place Profile"/>
 	<menu_item_call label="Карта мира" name="World Map"/>
 </menu>

From 06b56944af4dc7c3a216ea78a3e5659cdffdfd72 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 14 Nov 2022 12:34:02 +0100
Subject: [PATCH 08/22] Add some comment with example SLURL for "addgrid"

---
 indra/newview/fsgridhandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp
index 14f369ffda..8e97d8c519 100644
--- a/indra/newview/fsgridhandler.cpp
+++ b/indra/newview/fsgridhandler.cpp
@@ -1425,7 +1425,6 @@ std::string LLGridManager::getAppSLURLBase(const std::string& grid)
 class FSGridManagerCommandHandler : public LLCommandHandler
 {
 public:
-	// not allowed from outside the app
 	FSGridManagerCommandHandler() : LLCommandHandler("gridmanager", UNTRUSTED_THROTTLE),
 		mDownloadConnection()
 	{ }
@@ -1445,6 +1444,8 @@ public:
 			return false;
 		}
 
+		// Automatically add and select grid via secondlife:///app/gridmanager/addgrid/<URL-encoded login URI>
+		// Example: secondlife:///app/gridmanager/addgrid/http%3A%2F%2Fgrid.avatarlife.com%3A8002
 		if (params[0].asString() == "addgrid")
 		{
 			std::string login_uri = LLURI::unescape(params[1].asString());

From a5df39feb1de784813a1f338097b619053cbc054 Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Tue, 15 Nov 2022 19:01:46 +0100
Subject: [PATCH 09/22] FIRE-31369: Add inventory filter for coalesced objects

---
 indra/newview/llinventoryfilter.cpp           | 48 +++++++++++++++++++
 indra/newview/llinventoryfilter.h             |  9 ++++
 indra/newview/llinventorypanel.cpp            | 12 +++++
 indra/newview/llinventorypanel.h              |  4 ++
 indra/newview/llpanelmaininventory.cpp        | 27 +++++++++++
 indra/newview/llpanelmaininventory.h          |  5 ++
 .../ansastorm/xui/en/panel_main_inventory.xml | 11 +++++
 .../xui/en/menu_inventory_gear_default.xml    | 14 ++++++
 .../vintage/xui/en/panel_main_inventory.xml   | 11 +++++
 9 files changed, 141 insertions(+)

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index edbb61f178..dc0902e52d 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -54,6 +54,8 @@
 #include "fsgridhandler.h" // <FS:Beq> need to check if in opensim
 #endif
 
+#include "llinventorydefines.h"		// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+
 LLInventoryFilter::FilterOps::FilterOps(const Params& p)
 :	mFilterObjectTypes(p.object_types),
 	mFilterCategoryTypes(p.category_types),
@@ -69,6 +71,7 @@ LLInventoryFilter::FilterOps::FilterOps(const Params& p)
 	mFilterTypes(p.types),
 	mFilterUUID(p.uuid),
 	mFilterLinks(p.links),
+	mCoalescedObjectsOnly(p.coalesced_objects_only),		// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
 	mSearchVisibility(p.search_visibility)
 {
 }
@@ -338,6 +341,21 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
                 break;
             }
         default:
+            // <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+            if (mFilterOps.mCoalescedObjectsOnly)
+            {
+                // only bother to get the inventory item pointer if we are actually showing only coalesced objects
+                LLInventoryItem* item = gInventory.getItem(object_id);
+                if (item)
+                {
+                    if (!(item->getFlags() & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS))
+                    {
+                        return false;
+                    }
+                }
+            }
+            // </ FS:Zi>
+
             if ((1LL << object_type & mFilterOps.mFilterObjectTypes) == U64(0))
             {
                 return FALSE;
@@ -688,6 +706,9 @@ bool LLInventoryFilter::isNotDefault() const
 	not_default |= (mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate);
 	not_default |= (mFilterOps.mHoursAgo != mDefaultFilterOps.mHoursAgo);
 
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	not_default |= (mFilterOps.mCoalescedObjectsOnly != mDefaultFilterOps.mCoalescedObjectsOnly);
+
 	return not_default != 0;
 }
 
@@ -761,6 +782,22 @@ void LLInventoryFilter::setFilterObjectTypes(U64 types)
 	mFilterOps.mFilterTypes |= FILTERTYPE_OBJECT;
 }
 
+// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+void LLInventoryFilter::setFilterCoalescedObjects(bool coalesced)
+{
+	mFilterOps.mCoalescedObjectsOnly = coalesced;
+
+	LLInventoryFilter::EFilterModified modifyMode = FILTER_LESS_RESTRICTIVE;
+
+	if (coalesced)
+	{
+		modifyMode = FILTER_MORE_RESTRICTIVE;
+	}
+
+	setModified(modifyMode);
+}
+// </FS:Zi>
+
 void LLInventoryFilter::setFilterCategoryTypes(U64 types)
 {
 	updateFilterTypes(types, mFilterOps.mFilterCategoryTypes);
@@ -1545,6 +1582,8 @@ LLInventoryFilter& LLInventoryFilter::operator=( const  LLInventoryFilter&  othe
 	setFilterPermissions(other.getFilterPermissions());
 	setFilterSubString(other.getFilterSubString());
 	setDateRangeLastLogoff(other.isSinceLogoff());
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	setFilterCoalescedObjects(other.getFilterCoalescedObjects());
 	return *this;
 }
 
@@ -1567,6 +1606,8 @@ void LLInventoryFilter::toParams(Params& params) const
 	params.filter_ops.search_visibility = getSearchVisibilityTypes();
 	params.substring = getFilterSubString();
 	params.since_logoff = isSinceLogoff();
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	params.filter_ops.coalesced_objects_only = getFilterCoalescedObjects();
 }
 
 void LLInventoryFilter::fromParams(const Params& params)
@@ -1639,6 +1680,13 @@ void LLInventoryFilter::fromParams(const Params& params)
 		setDateRangeLastLogoff(params.since_logoff);
 	}
 	// </FS:Ansariel>
+
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	if (params.filter_ops.coalesced_objects_only.isProvided())
+	{
+		setFilterCoalescedObjects(params.filter_ops.coalesced_objects_only);
+	}
+	// </FS:Zi>
 }
 
 U64 LLInventoryFilter::getFilterTypes() const
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 6f244c43d6..f57ea4b004 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -140,6 +140,7 @@ public:
 			Optional<EFolderShow>		show_folder_state;
 			Optional<PermissionMask>	permissions;
 			Optional<EFilterCreatorType> creator_type;
+			Optional<bool>				coalesced_objects_only;		// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
 
 			Params()
 			:	types("filter_types", FILTERTYPE_OBJECT),
@@ -155,6 +156,7 @@ public:
 				date_search_direction("date_search_direction", FILTERDATEDIRECTION_NEWER),
 				show_folder_state("show_folder_state", SHOW_NON_EMPTY_FOLDERS),
 				creator_type("creator_type", FILTERCREATOR_ALL),
+				coalesced_objects_only("coalesced_objects_only", false),	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
 				permissions("permissions", PERM_NONE)
 			{}
 		};
@@ -178,6 +180,8 @@ public:
 		EFolderShow			mShowFolderState;
 		PermissionMask		mPermissions;
 		EFilterCreatorType	mFilterCreatorType;
+
+		bool			mCoalescedObjectsOnly;	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
 	};
 							
 	struct Params : public LLInitParam::Block<Params>
@@ -268,6 +272,11 @@ public:
 	// <FS>
 	BOOL 				getFilterWorn() const { return mFilterOps.mFilterTypes & FILTERTYPE_WORN; }
 
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	void				setFilterCoalescedObjects(bool coalesced);
+	bool				getFilterCoalescedObjects() const { return mFilterOps.mCoalescedObjectsOnly; }
+	// </FS:Zi>
+
 	// +-------------------------------------------------------------------+
 	// + Execution And Results
 	// +-------------------------------------------------------------------+
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 6cda352d7a..ac84c4d5c5 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -523,6 +523,18 @@ U64 LLInventoryPanel::getFilterLinks()
 }
 // </FS:Zi> Filter Links Menu
 
+// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+void LLInventoryPanel::setFilterCoalescedObjects(bool coalesced)
+{
+	getFilter().setFilterCoalescedObjects(coalesced);
+}
+
+bool LLInventoryPanel::getFilterCoalescedObjects()
+{
+	return getFilter().getFilterCoalescedObjects();
+}
+// </FS:Zi>
+
 void LLInventoryPanel::setSearchType(LLInventoryFilter::ESearchType type)
 {
 	getFilter().setSearchType(type);
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 67c437a926..b4b552b345 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -202,6 +202,10 @@ public:
 	BOOL getSinceLogoff();
 	void setFilterLinks(U64 filter_links);
 	U64 getFilterLinks();		// <FS:Zi> Filter Links Menu
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	void setFilterCoalescedObjects(bool coalesced);
+	bool getFilterCoalescedObjects();
+	// </FS:Zi>
 	// <FS:Zi> FIRE-1175 - Filter Permissions Menu
 	void setFilterPermissions(PermissionMask filter_permissions);
 	PermissionMask getFilterPermissions();
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index b46d79ac43..c047e0430a 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -169,6 +169,11 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	// <FS:Ansariel> Add handler for being able to directly route to onCustomAction
 	mCommitCallbackRegistrar.add("Inventory.CustomAction", boost::bind(&LLPanelMainInventory::onCustomAction, this, _2));
 
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	mCommitCallbackRegistrar.add("Inventory.CoalescedObjects.Toggle", boost::bind(&LLPanelMainInventory::onCoalescedObjectsToggled, this, _2));
+	mEnableCallbackRegistrar.add("Inventory.CoalescedObjects.Check", boost::bind(&LLPanelMainInventory::isCoalescedObjectsChecked, this, _2));
+	// </FS:Zi>
+
 	mSavedFolderState = new LLSaveFolderState();
 	mSavedFolderState->setApply(FALSE);
 
@@ -2027,6 +2032,28 @@ BOOL LLPanelMainInventory::isActionChecked(const LLSD& userdata)
 	return FALSE;
 }
 
+// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+void LLPanelMainInventory::onCoalescedObjectsToggled(const LLSD& userdata)
+{
+	const std::string command_name = userdata.asString();
+	if (command_name == "coalesced_objects_only")
+	{
+		getActivePanel()->setFilterCoalescedObjects(!getActivePanel()->getFilterCoalescedObjects());
+	}
+}
+
+bool LLPanelMainInventory::isCoalescedObjectsChecked(const LLSD& userdata)
+{
+	const std::string command_name = userdata.asString();
+	if (command_name == "coalesced_objects_only")
+	{
+		return getActivePanel()->getFilterCoalescedObjects();
+	}
+
+	return false;
+}
+// </FS:Zi>
+
 // <FS:Zi> Filter Links Menu
 void LLPanelMainInventory::onFilterLinksChecked(const LLSD& userdata)
 {
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index b51060233f..340293ec1b 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -195,6 +195,11 @@ protected:
 	BOOL isActionChecked(const LLSD& userdata);
 	void onCustomAction(const LLSD& command_name);
 
+	// <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects
+	void onCoalescedObjectsToggled(const LLSD& userdata);
+	bool isCoalescedObjectsChecked(const LLSD& userdata);
+	// </FS:Zi>
+
 	// <FS:Zi> Filter Links Menu
 	BOOL isFilterLinksChecked(const LLSD& userdata);
 	void onFilterLinksChecked(const LLSD& userdata);
diff --git a/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
index 7f7234bc43..7cf5867914 100644
--- a/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
@@ -484,6 +484,17 @@
 				function="Inventory.FilterPermissions.Check"
 				parameter="only_transfer" />
 		</menu_item_check>
+		<menu_item_separator />
+		<menu_item_check
+			name="inventory_filter_coalesced_objects_only"
+			label="Only Coalesced">
+			<on_click
+				function="Inventory.CoalescedObjects.Toggle"
+				parameter="coalesced_objects_only" />
+			<on_check
+				function="Inventory.CoalescedObjects.Check"
+				parameter="coalesced_objects_only" />
+		</menu_item_check>
 	</menu>
 	</menu_bar>
   
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index ac9b4013f4..1f0d24f784 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -321,6 +321,20 @@
 	<menu_item_separator />
 	<!-- </FS:Zi> -->
 
+	<!-- <FS:Zi> FIRE-31369: Add inventory filter for coalesced objects -->
+	<menu_item_check
+		name="inventory_filter_coalesced_objects_only"
+		label="Only Coalesced">
+		<on_click
+			function="Inventory.CoalescedObjects.Toggle"
+			parameter="coalesced_objects_only" />
+		<on_check
+			function="Inventory.CoalescedObjects.Check"
+			parameter="coalesced_objects_only" />
+	</menu_item_check>
+	<menu_item_separator />
+	<!-- </FS:Zi> -->
+
 	<menu_item_call
      label="Empty Trash"
      layout="topleft"
diff --git a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml
index a2275adced..ab548877c1 100644
--- a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml
@@ -486,6 +486,17 @@
 				parameter="only_transfer" />
 		</menu_item_check>
 		<!-- </FS:Zi> -->
+		<menu_item_separator />
+		<menu_item_check
+			name="inventory_filter_coalesced_objects_only"
+			label="Only Coalesced">
+			<on_click
+				function="Inventory.CoalescedObjects.Toggle"
+				parameter="coalesced_objects_only" />
+			<on_check
+				function="Inventory.CoalescedObjects.Check"
+				parameter="coalesced_objects_only" />
+		</menu_item_check>
 	</menu>
 
 	</menu_bar>

From cf96623c6433628da789574744e25fd98d77258a Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Tue, 15 Nov 2022 20:24:48 +0100
Subject: [PATCH 10/22] Updated Polish translation

---
 indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml    | 1 +
 .../newview/skins/default/xui/pl/menu_inventory_gear_default.xml | 1 +
 indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
index 9b29d56b08..9f2131dcca 100644
--- a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
@@ -76,6 +76,7 @@
 			<menu_item_check name="inventory_filter_only_modify" label="Tylko modyfikowalne" />
 			<menu_item_check name="inventory_filter_only_copy" label="Tylko kopiowalne" />
 			<menu_item_check name="inventory_filter_only_transfer" label="Tylko transferowalne" />
+			<menu_item_check name="inventory_filter_coalesced_objects_only" label="Tylko podniesione razem" />
 			<menu_item_check name="inventory_show_partial_results" label="Pokaż częściowe wyniki wyszukiwania" />
 		</menu>
 	</menu_bar>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
index 96691f0a46..75b656d170 100644
--- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
@@ -30,5 +30,6 @@
 	<menu_item_check name="inventory_filter_only_modify" label="Tylko modyfikowalne" />
 	<menu_item_check name="inventory_filter_only_copy" label="Tylko kopiowalne" />
 	<menu_item_check name="inventory_filter_only_transfer" label="Tylko transferowalne" />
+	<menu_item_check name="inventory_filter_coalesced_objects_only" label="Tylko podniesione razem" />
 	<menu_item_call label="Opróżnij Kosz" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml
index 2d492c649e..867c0a8378 100644
--- a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml
@@ -73,6 +73,7 @@
 			<menu_item_check name="inventory_filter_only_modify" label="Tylko modyfikowalne" />
 			<menu_item_check name="inventory_filter_only_copy" label="Tylko kopiowalne" />
 			<menu_item_check name="inventory_filter_only_transfer" label="Tylko transferowalne" />
+			<menu_item_check name="inventory_filter_coalesced_objects_only" label="Tylko podniesione razem" />
 			<menu_item_check name="inventory_show_partial_results" label="Pokaż częściowe wyniki wyszukiwania" />
 		</menu>
 	</menu_bar>

From 986d5f44d4cc5b1a87041a7a26eb548b925da6c1 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 16 Nov 2022 13:46:30 +0100
Subject: [PATCH 11/22] Update German translation

---
 indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml | 4 +---
 .../skins/default/xui/de/menu_inventory_gear_default.xml      | 1 +
 indra/newview/skins/vintage/xui/de/panel_main_inventory.xml   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml
index efc8e108cf..295ee640df 100644
--- a/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml
@@ -74,9 +74,7 @@
 			<menu_item_check name="inventory_filter_only_modify" label="Nur modifizierbar"/>
 			<menu_item_check name="inventory_filter_only_copy" label="Nur kopierbar"/>
 			<menu_item_check name="inventory_filter_only_transfer" label="Nur transferierbar"/>
-			<!-- Not implemented yet
-			<menu_item_check name="inventory_show_partial_results" label="Zeige unvollständige Suchergebnisse"/>
-			-->
+			<menu_item_check name="inventory_filter_coalesced_objects_only" label="Nur verbundene Objekte"/>
 		</menu>
 	</menu_bar>
 	<filter_editor label="Inventar filtern" name="inventory search editor" tool_tip="Einen oder mehrere Suchbegriffe eingeben, getrennt durch '+'"/>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
index 88c5a3962d..93428cb658 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
@@ -37,5 +37,6 @@
 	<menu_item_check name="inventory_filter_only_copy" label="Nur kopierbar"/>
 	<menu_item_check name="inventory_filter_only_transfer" label="Nur transferierbar"/>
 	<!-- ## Zi: Filter Links Menu -->
+	<menu_item_check name="inventory_filter_coalesced_objects_only" label="Nur verbundene Objekte"/>
 	<menu_item_call label="Papierkorb ausleeren" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml
index 11aed902e2..26daf6f44a 100644
--- a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml
@@ -74,6 +74,7 @@
 			<menu_item_check name="inventory_filter_show_links" label="Zeige Links"/>
 			<menu_item_check name="inventory_filter_only_links" label="Zeige nur Links"/>
 			<menu_item_check name="inventory_filter_hide_links" label="Links ausblenden"/>
+			<menu_item_check name="inventory_filter_coalesced_objects_only" label="Nur verbundene Objekte"/>
 		</menu>
 	</menu_bar>
 

From a96ed3097efb9fcebd9c936f40739323cfc9ed0f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 16 Nov 2022 14:06:20 +0100
Subject: [PATCH 12/22] Revert "phototools2.1 integration" - needs more work
 and also causes merge conflicts somewhere else I'm not going to deal with
 multiple times

This reverts commit b213b4d4ae5280aec586b53e836bd5d90c3adfc6.
---
 .../xui/en/floater_fixedenvironment.xml       | 306 ++++----
 .../default/xui/en/floater_phototools.xml     | 219 ++----
 .../xui/en/panel_settings_sky_atmos.xml       | 742 ++++++++----------
 .../xui/en/panel_settings_sky_clouds.xml      | 693 +++++++---------
 .../xui/en/panel_settings_sky_sunmoon.xml     | 603 ++++++--------
 .../default/xui/en/panel_settings_water.xml   | 499 ++++--------
 6 files changed, 1240 insertions(+), 1822 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index c3b2dbf989..8346268fa4 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -1,150 +1,162 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-can_tear_off="false"
-can_resize="false"
-can_drag_on_left="false"
-can_close="true"
-can_dock="true"
-bevel_style="in"
-height="530"
-layout="topleft"
-name="Fixed Environment"
-save_rect="true"
-title="Fixed Environment"
-save_visibility="false"
-help_topic="fs_fixed_environment"
-single_instance="true" 
-width="260">
-
-<string name="edit_sky">Edit Sky:</string>
-<string name="edit_water">Edit Water:</string>
-
-	<panel
-		name="P_Presetname"
-		follows="left|top"
-		layout="topleft"
-		top_pad="5"
-		left="5"
-		width="250"
-		height="30"
-		border_visible="true"
-		bevel_style="in"
-		background_visible="true">
-
-			<text
-				follows="left|top"
-				top_pad="10"
-				left="0"
-				width="40"
-				height="10"
-				name="info_panel_label">
-				Name:
-			</text>
-			
-			<line_editor
-				follows="left|top"
-				top_delta="-5"
-				left_pad="0"
-				width="205"
-				name="settings_name"
-				prevalidate_callback="ascii"
-				max_length_chars="63"
-				height="20"/>
-			
-	</panel>
-	
-	<panel
-	name="P_Environment_Tab"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="5"
-	width="250"
-	height="445"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-		<tab_container
-			follows="all"
-			halign="center"
-			layout="topleft"
-			left="0"
-			top_pad="5"
-			height="440"
-			width="250"
-			name="tab_settings"
-			tab_position="top"
-			tab_max_width="80"
-			tab_width="80">
-		</tab_container>
-	</panel>
-
-	<panel
-		name="info_panel"
-		follows="left|top"
-		layout="topleft"
-		top_pad="0"
-		left="5"
-		width="250"
-		height="33"
-		border_visible="true"
-		bevel_style="in"
-		background_visible="true">
-
-		<button
-			height="23"
-			label="Load"
-			follows="left|top"
-			left="5"
-			top_pad="5"
-			name="btn_load"
-			tool_tip="Load a settings from inventory" 
-			width="55" />
-			
-		<button
-			height="23"
-			label="Import"
-			follows="left|top"
-			left_pad="01"
-			top_delta="0"
-			name="btn_import"
-			tool_tip="Import legacy settings from disk." 
-			width="55" />
-			
-		<button
-			follows="left|top"
-			height="23"
-			label="Save"
-			left_pad="1"
-			layout="topleft"
-			name="btn_commit"
-			top_delta="0"
-			width="55" />
-		<button
-			follows="left|top"
-			height="23"
-			name="btn_flyout"
-			label=""
-			layout="topleft"
-			left_pad="0"
-			tab_stop="false"
-			top_delta="0"
-			image_selected="SegmentedBtn_Right_Selected_Press"
-			image_unselected="SegmentedBtn_Right_Off"
-			image_pressed="SegmentedBtn_Right_Press"
-			image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-			image_overlay="Arrow_Small_Up"
-			width="20"/>
-		<button
-			follows="left|top"
-			height="23"
-			left_pad="0"
-			label="Cancel"
-			layout="topleft"
-			name="btn_cancel"
-			top_delta="0"
-			tool_tip="Revert to last saved version"
-			width="55" />
-	</panel>
-
+        can_tear_off="false"
+        can_resize="false"
+        can_drag_on_left="false"
+        can_close="true"
+        can_dock="false"
+        bevel_style="in"
+        height="550"
+        layout="topleft"
+        name="Fixed Environment"
+        save_rect="true"
+        title="Fixed Environment"
+        save_visibility="false"
+        help_topic="fs_fixed_environment"
+        single_instance="true" 
+        width="750">
+    <string name="edit_sky">Edit Sky:</string>
+    <string name="edit_water">Edit Water:</string>
+    <layout_stack name="floater_stack"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="vertical">
+        <layout_panel name="info_panel"
+                auto_resize="false"
+                user_resize="false"
+                min_height="60">
+            <text
+                    follows="left|top"
+                    top_delta="30"
+                    left_delta="10"
+                    width="35"
+                    height="20"
+                    name="info_panel_label"
+                    font="SansSerif">
+                Name:
+            </text>
+            <line_editor
+                    follows="left|top"
+                    top_delta="-2"
+                    left_delta="45"
+                    width="250"
+                    name="settings_name"
+                    prevalidate_callback="ascii"
+                    max_length_chars="63"
+                    height="20"/>
+            <button
+                    height="23"
+                    label="Load"
+                    follows="left|top"
+                    left_delta="260"
+                    font="SansSerif"
+                    top_delta="-2"
+                    name="btn_load"
+                    tool_tip="Load a settings from inventory" 
+                    width="96" />
+            <button
+                    height="23"
+                    label="Import"
+                    follows="right|top"
+                    right="-10"
+                    font="SansSerif"
+                    top_delta="0"
+                    name="btn_import"
+                    tool_tip="Import legacy settings from disk." 
+                    width="96" />
+        </layout_panel>
+        <layout_panel name="tab_area"
+                auto_resize="true"
+                user_resize="false"
+                height="11"
+                min_height="0"
+                visible="true">
+            <tab_container
+                    follows="all"
+                    halign="left"
+                    layout="topleft"
+                    left="0"
+                    name="tab_settings"
+                    tab_position="top"
+                    tab_width="120"
+                    tab_padding_right="3">
+                <!-- Tabs inserted here in code -->
+            </tab_container>
+        </layout_panel>
+        <layout_panel name="button_panel"
+                follows="left|top|right|bottom"
+                auto_resize="false"
+                user_resize="false"
+                height="29"
+                visible="true">
+            <layout_stack
+                    follows="bottom|left|right"
+                    height="23"
+                    layout="topleft"
+                    mouse_opaque="false"
+                    name="button_bar_ls"
+                    left="212"
+                    orientation="horizontal"
+                    top="0"
+                    width="313">
+                <layout_panel
+                        follows="bottom|left|right"
+                        height="23"
+                        layout="bottomleft"
+                        left="0"
+                        mouse_opaque="false"
+                        name="save_btn_lp"
+                        auto_resize="true"
+                        width="156">
+                    <button
+                            follows="bottom|left|right"
+                            height="23"
+                            label="Save"
+                            left="1"
+                            layout="topleft"
+                            name="btn_commit"
+                            top="0"
+                            width="155" />
+                    <button
+                            follows="bottom|right"
+                            height="23"
+                            name="btn_flyout"
+                            label=""
+                            layout="topleft"
+                            left_pad="-20"
+                            tab_stop="false"
+                            top="0"
+                            image_selected="SegmentedBtn_Right_Selected_Press"
+                            image_unselected="SegmentedBtn_Right_Off"
+                            image_pressed="SegmentedBtn_Right_Press"
+                            image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                            image_overlay="Arrow_Small_Up"
+                            width="20"/>
+                </layout_panel>
+                <layout_panel
+                        follows="bottom|left|right"
+                        height="23"
+                        layout="bottomleft"
+                        left_pad="3"
+                        mouse_opaque="false"
+                        name="revert_btn_lp"
+                        auto_resize="true"
+                        width="147">
+                    <button
+                            follows="bottom|right"
+                            height="23"
+                            right="-1"
+                            label="Cancel"
+                            layout="topleft"
+                            name="btn_cancel"
+                            top="0"
+                            tool_tip="Revert to last saved version"
+                            width="147" />
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+    </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_phototools.xml b/indra/newview/skins/default/xui/en/floater_phototools.xml
index 253ce3aec8..b101bc2781 100644
--- a/indra/newview/skins/default/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/default/xui/en/floater_phototools.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <floater
- positioning="left"
+ positioning="right"
  can_resize="false"
  can_dock="false"
  can_close="true"
@@ -254,7 +254,8 @@
 				 label_selected=""
 				 scale_image="true"
 				/>
-								
+				
+				
 				<button
 				 follows="top|left|right"
 				 height="20"
@@ -279,30 +280,6 @@
 				</button>
 			</panel>
 
-			<panel
-			 name="PT_WL_Presets"
-			 follows="top|left"
-			 layout="topleft"
-			 top_pad="5"
-			 left="0"
-			 width="285"
-			 height="22"
-			 bg_alpha_color="Phototools_Header"
-			 border_visible="true"
-			 border_thickness="1"
-			 background_visible="true">
-				<text
-				 name="T_WL_Presets" 
-				 follows="left|top"
-				 layout="topleft"
-				 left="10"
-				 font="SansSerif"
-				 height="17"
-				 width="200">
-					Customizing Presets 
-				</text>
-			</panel>
-
 			<panel
 			 visible="true"
 			 name="P_Q_Windlights"
@@ -310,7 +287,7 @@
 			 layout="topleft"
 			 top_pad="5"
 			 left="4"
-			 width="135"
+			 width="275"
 			 height="135"
 			 border_visible="true"
 			 background_visible="true">
@@ -318,31 +295,31 @@
 				 name="T_Q_Windlights"
 				 follows="left|top"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="5"
 				 height="20"
 				 word_wrap="true"
-				 width="125">
-					Quick Selection
+				 width="155">
+					Quick Environments
 				</text>
 				<view_border
 				 bevel_style="none"
 				 follows="left|top"
 				 height="0"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 name="horiz_separator1"
 				 top_pad="-7"
-				 width="125"/>
+				 width="255"/>
 				<button
 				 follows="left|top"
 				 name="Sunrise"
 				 height="20"
 				 label="Sunrise"
 				 layout="topleft"
-				 left="05"
+				 left="10"
 				 top_pad="5"
-				 width="125">
+				 width="255">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="sunrise"/>
@@ -353,9 +330,9 @@
 				 height="20"
 				 label="Noon"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="2"
-				 width="125">
+				 width="255">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="noon"/>
@@ -366,9 +343,9 @@
 				 height="20"
 				 label="Sunset"
 				 layout="topleft"
-				 left="05"
+				 left="10"
 				 top_pad="2"
-				 width="125">
+				 width="255">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="sunset"/>
@@ -379,9 +356,9 @@
 				 height="20"
 				 label="Midnight"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="2"
-				 width="125">
+				 width="255">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="midnight"/>
@@ -392,17 +369,17 @@
 				 height="20"
 				 label="Shared Environment"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="2"
-				 width="125">
+				 width="255">
 					<button.commit_callback
 					 function="World.EnvSettings"
 					 parameter="region"/>
 				</button>
 			</panel>
-
+			
 			<panel
-			 visible="True"
+			 visible="false"
 			 name="P_WL_Presets"
 			 follows="top|left"
 			 layout="topleft"
@@ -416,90 +393,87 @@
 				 name="T_WL_Presets"
 				 follows="left|top"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="5"
 				 height="20"
 				 word_wrap="true"
 				 tool_tip="Click an item below to create new preset or modify an existing one."
-				 width="130">
-					Manage Presets
+				 width="150">
+					Windlight Presets
 				</text>
 				<view_border
 				 bevel_style="none"
 				 follows="left|top"
 				 height="0"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 name="horiz_separator2"
 				 top_pad="-7"
-				 width="125"/>
-				<!--button
+				 width="120"/>
+				<button
 				 follows="left|top"
 				 name="new_sky_preset"
 				 height="20"
 				 label="New Sky Preset"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="5"
-				 width="125">
+				 width="120">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="new_sky"/>
-				</button-->
+				</button>
 				<button
 				 follows="left|top"
 				 name="edit_sky_preset"
 				 height="20"
-				 label="Sky Preset"
+				 label="Edit Sky Preset"
 				 layout="topleft"
-				 left="5"
-				 top_pad="5"
-				 width="125">
+				 left="10"
+				 top_pad="2"
+				 width="120">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="edit_sky"/>
 				</button>
 			
-				<!--view_border
+				<view_border
 				 bevel_style="none"
 				 follows="left|top"
 				 height="0"
 				 layout="topleft"
 				 left="5"
 				 name="horiz_separator3"
-				 top_pad="5"
-				 width="125"/-->
-				<!--button
+				 top_pad="10"
+				 width="125"/>
+				<button
 				 follows="left|top"
 				 name="new_water_preset"
 				 height="20"
 				 label="New Water Preset"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="10"
-				 width="125">
+				 width="120">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="new_water"/>
-				</button-->
+				</button>
 				<button
 				 follows="left|top"
 				 name="edit_water_preset"
 				 height="20"
-				 label="Water Preset"
+				 label="Edit Water Preset"
 				 layout="topleft"
-				 left="5"
+				 left="10"
 				 top_pad="2"
-				 width="125">
+				 width="120">
 					<button.commit_callback
 					 function="World.EnvPreset"
 					 parameter="edit_water"/>
 				</button>
-				
-
-
 			</panel>
-			
+
 			<panel
 			 name="P_W_Reflections"
 			 follows="top|left"
@@ -584,7 +558,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="75"
+			 height="54"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -784,7 +758,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="180"
+			 height="165"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -802,7 +776,7 @@
 				 control_name="RenderShadowResolutionScale"
 				 follows="left|right"
 				 height="16"
-				 increment="0.5"
+				 increment="0.01"
 				 layout="topleft"
 				 left_pad="-20"
 				 min_val="0"
@@ -895,11 +869,11 @@
 				 control_name="RenderShadowBlurSize"
 				 follows="left|right"
 				 height="16"
-				 increment="1"
+				 increment="0.01"
 				 layout="topleft"
 				 left_pad="-20"
 				 min_val="0.00"
-				 max_val="20"
+				 max_val="4"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -944,11 +918,11 @@
 				 name="SB_Shd_Soften"
 				 follows="left|right"
 				 height="16"
-				 increment="0.01"
+				 increment="0.001"
 				 layout="topleft"
 				 left_pad="-20"
-				 min_val="0.01"
-				 max_val="1"
+				 min_val="0.001"
+				 max_val="3"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -1072,60 +1046,7 @@
 				</button>
 
 				<text
-				 name="T_FOV_Cutoff"
-				 follows="top|left"
-				 layout="topleft"
-				 left="5"
-				 top_pad="5"
-				 tool_tip="This determines the FOV cutoff at which the viewer will switch between ortho instead of perspective projection. If you are getting shadows that are 'jaggedy' try adjusting this setting for improvement. Also adjusting the XYZ values for the debug setting RenderShadowSplitExponent can be VERY helpful."
-				 width="80">
-					Spot Offset
-				</text>
-				<slider_bar
-				 name="SB_FOV_Cutoff"
-				 can_edit_text="true"
-				 control_name="RenderSpotShadowOffset"
-				 follows="left|right"
-				 height="16"
-				 increment="0.0001"
-				 decimal_digits="4"
-				 layout="topleft"
-				 left_pad="-20"
-				 min_val="0"
-				 max_val=".04"
-				 top_delta="-2"
-				 width="127"/>
-				<spinner
-				 name="S_FOV_Cutoff"
-				 can_edit_text="true"
-				 control_name="RenderSpotShadowOffset"
-				 top_delta="-3"
-				 label_width="0"
-				 left_pad="3"
-				 decimal_digits="4"
-				 follows="top|right"
-				 max_val="100"
-				 min_val="0"
-				 width="53"
-				 increment="0.001"
-				 border_visible="false"/>
-				<button
-				 follows="left|top"
-				 name="FOV_Cutoff_Reset"
-				 height="22"
-				 label="D"
-				 layout="topleft"
-				 left_pad="0"
-				 top_delta="0"
-				 width="20"
-				 tool_tip="Reset to the default value.">
-					<button.commit_callback
-					 function="ResetControl"
-					 parameter="RenderSpotShadowOffset"/>
-				</button>
-				
-				<text																																																												
-				name="T_Shd_Bias"
+				 name="T_Shd_Bias"
 				 follows="top|left"
 				 layout="topleft"
 				 left="5"
@@ -1142,8 +1063,8 @@
 				 increment="0.0001"
 				 layout="topleft"
 				 left_pad="-20"
-				 min_val="-.00001"
-				 max_val="0.01"
+				 min_val="-.008"
+				 max_val="0"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -1229,7 +1150,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="115"
+			 height="120"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -1397,7 +1318,7 @@
 				 increment="0.001"
 				 layout="topleft"
 				 left_pad="-20"
-				 min_val="-10"
+				 min_val="0"
 				 max_val="1"
 				 top_delta="-2"
 				 width="127"/>
@@ -1442,7 +1363,7 @@
 				 layout="topleft"
 				 left_pad="-20"
 				 min_val="0.001"
-				 max_val="5"
+				 max_val="3"
 				 top_delta="-2"
 				 width="127"/>
 				<spinner
@@ -1568,7 +1489,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="185"
+			 height="175"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -1632,7 +1553,6 @@
 				</text>
 				<slider_bar
 				 name="SB_FOV"
-				 
 				 control_name="CameraFieldOfView"
 				 follows="left|top"
 				 height="16"
@@ -1645,7 +1565,6 @@
 				 width="127"/>
 				<spinner
 				 name="S_FOV"
-				 
 				 control_name="CameraFieldOfView"
 				 top_delta="-3"
 				 label_width="0"
@@ -1655,8 +1574,7 @@
 				 max_val="360"
 				 min_val="-360"
 				 width="53"
-				 increment="0.1"
-								/>
+				 increment="0.1"/>
 				<button
 				 follows="left|top"
 				 name="Reset_FOV"
@@ -1684,7 +1602,6 @@
 				</text>
 				<slider_bar
 				 name="SB_F_Number"
-
 				 control_name="CameraFNumber"
 				 follows="top|left"
 				 height="16"
@@ -1697,7 +1614,6 @@
 				 width="127"/>
 				<spinner
 				 name="S_F_Number"
-				 
 				 control_name="CameraFNumber"
 				 top_delta="-3"
 				 label_width="0"
@@ -1707,8 +1623,7 @@
 				 max_val="128"
 				 min_val="-128"
 				 width="53"
-				 increment=".01"
-								/>
+				 increment=".01"/>
 				<button
 				 follows="left|top"
 				 name="Reset_F_Number"
@@ -1736,7 +1651,6 @@
 				</text>
 				<slider_bar
 				 name="SB_Focal_Length"
-				 
 				 control_name="CameraFocalLength"
 				 follows="top|left"
 				 height="16"
@@ -1749,7 +1663,6 @@
 				 width="127"/>
 				<spinner
 				 name="S_Focal_Length"
-				 
 				 control_name="CameraFocalLength"
 				 top_delta="-3"
 				 label_width="0"
@@ -1759,8 +1672,7 @@
 				 max_val="10000"
 				 min_val="0"
 				 width="53"
-				 increment="1"
-								/>
+				 increment="1"/>
 				<button
 				 follows="left|top"
 				 name="Reset_Focal_Length"
@@ -1788,7 +1700,6 @@
 				</text>
 				<slider_bar
 				 name="SB_Foc_Time"
-				 
 				 control_name="CameraFocusTransitionTime"
 				 follows="top|left"
 				 height="16"
@@ -1801,7 +1712,6 @@
 				 width="127"/>
 				<spinner
 				 name="S_Foc_Time"
-				 
 				 control_name="CameraFocusTransitionTime"
 				 top_delta="-3"
 				 label_width="0"
@@ -1811,8 +1721,7 @@
 				 max_val="100"
 				 min_val=".001"
 				 width="53"
-				 increment="0.01"
-									/>
+				 increment="0.01"/>
 				<button
 				 follows="left|top"
 				 name="Reset_Foc_Time"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index d08b8ecc5f..d01318d0b7 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -1,411 +1,339 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-border="true"
-follows="all"
-label="Atmos"
-layout="topleft"
-left="0"
-name="panel_settings_sky_atmos"
-top="0">
-		
-	<panel
-	name="P_Atmosphere_Header"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="22"
-	bg_alpha_color="EmphasisColor"
-	border_visible="true"
-	border_thickness="1"
-	background_visible="true">
-	
-		<text
-		name="T_Atmosphere_Header"
-		follows="left|top"
-		layout="topleft"
-		left="5"
-		font="SansSerif"
-		value="Atmospheric Colors"/>
-			
-	</panel>
+        border="true"
+        follows="all"
+        label="Atmosphere &amp; Lighting"
+        layout="topleft"
+        left="0"
+        name="panel_settings_sky_atmos"
+        top="0">
+    <layout_stack
+            name="main_ls"
+            follows="all"
+            layout="topleft"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            orientation="vertical">
+        <layout_panel
+                name="top_lp"
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="false"
+                visible="true"
+                height="75">
 
-	<panel
-	name="P_Atmos_Settings"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="95"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-		<text
-		name="ambient_color_label"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left="5"
-		top_pad="10"
-		width="55">
-		Ambient:
-		</text>
-				
-		<color_swatch
-		can_apply_immediately="true"
-		follows="left|top"
-		height="25"
-		label_height="0"
-		layout="topleft"
-		left_delta="55"
-		name="ambient_light"
-		top_delta="-5"
-		width="185" />
-				
-		<text
-		name="blue_horizon_label"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left="5"
-		top_pad="10"
-		width="55">
-		BluHrz:
-		</text>
-				
-		<color_swatch
-		can_apply_immediately="true"
-		follows="left|top"
-		height="25"
-		label_height="0"
-		layout="topleft"
-		left_delta="55"
-		name="blue_horizon"
-		top_delta="-5"
-		width="185" />
-			
-		<text
-		name="blue_density_label"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left="5"
-		top_pad="10"
-		width="55">
-		Blue Den:
-		</text>
-				
-		<color_swatch
-		can_apply_immediately="true"
-		follows="left|top"
-		height="25"
-		label_height="0"
-		layout="topleft"
-		left_delta="55"
-		name="blue_density"
-		top_delta="-5"
-		width="185" />
-	</panel>
-
-	<panel
-	name="P_Atmosphere_Header"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="22"
-	bg_alpha_color="EmphasisColor"
-	border_visible="true"
-	border_thickness="1"
-	background_visible="true">
-	
-		<text
-		name="T_Atmosphere_Header"
-		follows="left|top"
-		layout="topleft"
-		left="5"
-		font="SansSerif"
-		value="Atmosphere Settings"/>
-			
-	</panel>
-
-	<panel
-	name="P_Atmosphere_OtherSettings"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="115"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-		<text
-		name="haze_horizon_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		
-		width="50">
-		HazHoz:
-		</text>
-
-		<slider
-		decimal_digits="3"
-		follows="left|top"
-		height="16"
-		increment="0.001"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		min_val="0"
-		max_val="5"
-		name="haze_horizon"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-		
-		<text
-		name="haze_density_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		HazDen:
-		</text>
-		
-		<slider
-		decimal_digits="3"
-		follows="left|top"
-		height="16"
-		increment="0.001"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		min_val="0"
-		max_val="5"
-		name="haze_density"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-
-		<text
-		name="density_multiplier_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Density:
-		</text>
-		
-		<slider
-		decimal_digits="4"
-		follows="left|top"
-		height="16"
-		increment="0.0001"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		min_val="0.0001"
-		max_val="2"
-		name="density_multip"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-		
-		<text
-		name="distance_multiplier_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Distance Multiplier:
-		</text>
-		
-		<slider
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0.8"
-		layout="topleft"
-		left="55"
-		min_val="0.05"
-		max_val="1000"
-		name="distance_multip"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-		
-		<text
-		name="maximum_altitude_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		MaxAlt:
-		</text>
-		
-		<slider
-		decimal_digits="1"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		min_val="0"
-		max_val="10000"
-		name="max_alt"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-		
-		<text
-		name="scene_gamma_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Gamma:
-		</text>
-		
-		<slider
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.1"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		max_val="20"
-		name="scene_gamma"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-	</panel>
-
-	<panel
-	name="P_Rainbow_Header"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="22"
-	bg_alpha_color="EmphasisColor"
-	border_visible="true"
-	border_thickness="1"
-	background_visible="true">
-	
-		<text
-		name="T_Rainbow_Header"
-		follows="left|top"
-		layout="topleft"
-		left="5"
-		font="SansSerif"
-		value="Rainbow and Halo Settings"
-		width="250"/>
-		
-	</panel>
-	
-
-	<panel
-		name="P_Rainbow_OtherSettings"
-		follows="left|top"
-		layout="topleft"
-		top_pad="5"
-		left="0"
-		width="250"
-		height="60"
-		border_visible="true"
-		bevel_style="in"
-		background_visible="true">
-		
-		<text
-		name="moisture_level_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Moisture:
-		</text>
-		
-		<slider
-		decimal_digits="3"
-		follows="left|top"
-		height="16"
-		increment="0.001"
-		initial_value="0"
-		left="55"
-		left_pad="50"
-		layout="topleft"
-		min_val="0"
-		max_val="1"
-		name="moisture_level"
-		width="190"
-		can_edit_text="true"/>
-		
-		<text
-		name="droplet_radius_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Droplet:
-		</text>
-		
-		<slider
-		decimal_digits="3"
-		follows="left|top"
-		height="16"
-		increment="0.001"
-		initial_value="0"
-		left="55"
-		left_pad="50"
-		layout="topleft"
-		min_val="5.0"
-		max_val="1000.0"
-		name="droplet_radius"
-		width="190"
-		can_edit_text="true"/>
-		
-		<text
-		name="ice_level_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Ice Level:
-		</text>
-		
-		<slider
-		decimal_digits="3"
-		follows="left|top"
-		height="16"
-		increment="0.001"
-		initial_value="0"
-		left="55"
-		layout="topleft"
-		left_pad="50"
-		min_val="0"
-		max_val="1"
-		name="ice_level"
-		width="190"
-		can_edit_text="true"/>
-	</panel>
+            <text
+                    name="ambient_color_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_pad="15"
+                    top_pad="15"
+                    width="100">
+                Ambient Color:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="ambient_light"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    name="blue_horizon_label"
+                    follows="left"
+                    height="10"
+                    layout="topleft"
+                    left_delta="110"
+                    top_delta="-15"
+                    width="100">
+                Blue Horizon:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="blue_horizon"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    name="blue_density_label"
+                    follows="left"
+                    height="10"
+                    layout="topleft"
+                    left_delta="110"
+                    top_delta="-15"
+                    width="100">
+                Blue Density:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="blue_density"
+                    top_pad="5"
+                    width="60" />
+        </layout_panel>
+        <layout_panel
+                name="bottom_lp"
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="false"
+                visible="true">
+            <layout_stack name="atmosphere1"
+                    left="5"
+                    top="5"
+                    right="-5"
+                    bottom="-5"
+                    follows="left|top|right|bottom"
+                    orientation="hoizontal">
+                <layout_panel
+                        name="left_lp"
+                        border="false"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="false"
+                        visible="true"
+                        min_width="225">
+                    <text
+                            name="haze_horizon_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="10"
+                            width="100">
+                        Haze Horizon:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_pad="5"
+                            min_val="0"
+                            max_val="5"
+                            name="haze_horizon"
+                            top_delta="0"
+                            width="207"
+                            can_edit_text="true"/>
+                    <text
+                            name="haze_density_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="100">
+                        Haze Density:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_pad="5"
+                            min_val="0"
+                            max_val="5"
+                            name="haze_density"
+                            top_delta="0"
+                            width="207"
+                            can_edit_text="true"/>
+                    <text
+                            name="moisture_level_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="100">
+                        Moisture Level:
+                    </text>
+                     <slider
+                            decimal_digits="3"
+                            follows="left|top"
+                            height="14"
+                            increment="0.001"
+                            initial_value="0"
+                            left_pad="5"
+                            top_delta="0"
+                            layout="topleft"
+                            min_val="0"
+                            max_val="1"
+                            name="moisture_level"
+                            width="207"
+                            can_edit_text="true"/>
+                    <text
+                            name="droplet_radius_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="100">
+                        Droplet Radius:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="14"
+                            increment="0.01"
+                            initial_value="0"
+                            left_pad="5"
+                            top_delta="0"
+                            layout="topleft"
+                            min_val="5.0"
+                            max_val="1000.0"
+                            name="droplet_radius"
+                            width="207"
+                            can_edit_text="true"/>
+                    <text
+                            name="ice_level_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="100">
+                        Ice Level:
+                    </text>
+                    <slider
+                            decimal_digits="3"
+                            follows="left|top"
+                            height="14"
+                            increment="0.001"
+                            initial_value="0"
+                            left_pad="5"
+                            layout="topleft"
+                            top_delta="0"
+                            min_val="0"
+                            max_val="1"
+                            name="ice_level"
+                            width="207"
+                            can_edit_text="true"/>
+                </layout_panel>            
+                <layout_panel
+                        name="right_lp"
+                        border="false"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="false"
+                        visible="true"
+                        min_width="225">
+                    <text
+                            name="density_multiplier_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="10"
+                            width="105">
+                        Density Multiplier:
+                    </text>
+                    <slider
+                            decimal_digits="4"
+                            follows="left|top"
+                            height="16"
+                            increment="0.0001"
+                            initial_value="0"
+                            layout="topleft"
+                            left_pad="5"
+                            min_val="0.0001"
+                            max_val="2"
+                            name="density_multip"
+                            top_delta="0"
+                            width="219"
+                            can_edit_text="true"/>
+                    <text
+                            name="distance_multiplier_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="105">
+                        Distance Multiplier:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0.8"
+                            layout="topleft"
+                            left_pad="5"
+                            min_val="0.05"
+                            max_val="1000"
+                            name="distance_multip"
+                            top_delta="0"
+                            width="219"
+                            can_edit_text="true"/>
+                    <text
+                            name="maximum_altitude_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="105">
+                        Maximum Altitude:
+                    </text>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_pad="5"
+                            min_val="0"
+                            max_val="10000"
+                            name="max_alt"
+                            top_delta="0"
+                            width="219"
+                            can_edit_text="true"/>
+                            <text
+                            name="scene_gamma_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left="5"
+                            top_pad="15"
+                            width="105">
+                        Scene Gamma:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_pad="5"
+                            max_val="20"
+                            name="scene_gamma"
+                            top_delta="0"
+                            width="219"
+                            can_edit_text="true"/>
+                </layout_panel>            
+            </layout_stack>                
+        </layout_panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 6e5cc49e76..7fd7c063bf 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -1,418 +1,281 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-border="true"
-follows="all"
-label="Clouds"
-layout="topleft"
-left="0"
-help_topic="land_general_tab"
-name="panel_settings_sky_clouds"
-top="0"
->
-<!--layout_stack 
-name="main_ls"
-follows="all"
-layout="topleft"
-left="5"
-top="5"
-right="-5"
-bottom="-5"
-orientation="hoizontal">
-<layout_panel
-name="left_lp"
-border="true"
-bevel_style="in"
-auto_resize="true"
-user_resize="false"
-visible="true"
-height="75"-->
-
-
-	<panel
-	name="P_Clouds_Header"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="22"
-	bg_alpha_color="EmphasisColor"
-	border_visible="true"
-	border_thickness="1"
-	background_visible="true">
-
-		<text
-		name="T_Clouds_Header"
-		follows="left|top"
-		layout="topleft"
-		left="5"
-		font="SansSerif"
-		value="Cloud Settings"/>
-			
-	</panel>	
-
-	<panel
-	name="P_Atmos_Settings"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="35"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-		<text
-		name="cloud_color_label"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left="5"
-		top_pad="10"
-		width="50">
-		Color:
-		</text>
-
-		<color_swatch
-		can_apply_immediately="true"
-		follows="left|top"
-		height="25"
-		label_height="0"
-		layout="topleft"
-		left_delta="55"
-		name="cloud_color"
-		top_delta="-5"
-		width="185" /> 	
-
-	</panel>
-
-	<panel
-	name="P_Cloud_Density"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="60"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-	
-	
-		<text
-		name="cloud_coverage_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="55">
-		Cover:
-		</text>
-	
-		<slider
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		min_val="0"
-		max_val="1"
-		name="cloud_coverage"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-				
-		<text
-		name="cloud_scale_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Scale:
-		</text>
-
-		<slider
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		min_val="0.01"
-		max_val="3"
-		name="cloud_scale"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-
-		<text
-		name="cloud_variance_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Variance:
-		</text>
-
-		<slider
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="55"
-		min_val="0"
-		max_val="1.0"
-		name="cloud_variance"
-		left_pad="50"
-		width="190"
-		can_edit_text="true"/>
-		
-	</panel>
-
-	<panel
-	name="P_Cloud_Density"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="80"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-		<text
-		type="string"
-		length="1"
-		follows="left|top"
-		font="SansSerif"
-		height="16"
-		layout="topleft"
-		left="5"
-		name="cloud_density_label"
-		top_pad="5"
-		tool_tip="Cloud XY/Density - Use the X and Y sliders to change the horizontal position of all clouds in the sky. The D slider affects the overall density of the individual clouds; at low settings you will see thin, wispy clouds, and at higher settings you will see thicker, more solid clouds."
-		width="240">
-		Cloud XY/Density
-		</text>
-
-		<slider
-		label="X"
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="5"
-		min_val="0"
-		max_val="1"
-		name="cloud_density_x"
-		top_pad="2"
-		width="240"
-		can_edit_text="true"/>
-
-		<slider
-		label="Y"
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="5"
-		min_val="0"
-		max_val="1"
-		name="cloud_density_y"
-		top_pad="2"
-		width="240"
-		can_edit_text="true"/>
-
-		<slider
-		label="D"
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="5"
-		min_val="0"
-		max_val="3"
-		name="cloud_density_d"
-		top_delta="20"
-		width="240"
-		can_edit_text="true"/>
-
-	</panel>
-
-	<panel
-	name="P_Cloud_Detail"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="80"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-		<text
-		type="string"
-		length="1"
-		follows="left|top"
-		font="SansSerif"
-		height="16"
-		layout="topleft"
-		left="5"
-		name="cloud_detail_label"
-		top_pad="5"
-		tool_tip="Cloud XY/Density - Use the X and Y sliders to change the horizontal position of all clouds in the sky. The D slider affects the overall density of the individual clouds; at low settings you will see thin, wispy clouds, and at higher settings you will see thicker, more solid clouds."
-		width="240">
-		Cloud XY/Detail
-		</text>
-
-
-		<slider
-		label="X"
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left="5"
-		min_val="0"
-		max_val="1"
-		name="cloud_detail_x"
-		top_pad="2"
-		width="240"
-		can_edit_text="true"/>
-
-		<slider
-		label="Y"
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left_delta="0"
-		min_val="0"
-		max_val="1"
-		name="cloud_detail_y"
-		top_delta="20"
-		width="240"
-		can_edit_text="true"/>
-
-		<slider
-		label="D"
-		decimal_digits="2"
-		follows="left|top"
-		height="16"
-		increment="0.01"
-		initial_value="0"
-		layout="topleft"
-		left_delta="0"
-		min_val="0"
-		max_val="1"
-		name="cloud_detail_d"
-		top_delta="20"
-		width="240"
-		can_edit_text="true"/>	
-		
-	</panel>
-
-	<panel	
-	name="P_Cloud_Scroll"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="105"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-	
-		<text
-		name="cloud_scroll_label"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left="5"
-		top_pad="5"
-		width="40">
-		Scroll:
-		</text>
-
-		<text
-		name="cloud_image_label"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left_pad="90"
-		top_delta="0"
-		width="50">
-		Image:
-		</text>
-
-		<xy_vector
-		follows="left|top"
-		name="cloud_scroll_xy"
-		width="110"
-		height="80"
-		visible="true"
-		left="5"
-		top_pad="5"
-		min_val_x="-30"
-		max_val_x="30"
-		min_val_y="-30"
-		max_val_y="30" 
-		logarithmic="1"/>
-
-		<texture_picker
-		height="100"
-		layout="topleft"
-		left_pad="20"
-		name="cloud_map"
-		top_delta="0"
-		width="110"/>
-	
-		
-<!--
-		<text
-		name="cloud_image_label"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left_pad="3"
-		top_delta="0"
-		width="50">
-		Image:
-		</text>
--->
-
-		<!--/layout_panel>
-		<layout_panel
-		name="right_lp"
-		border="true"
-		bevel_style="in"
-		auto_resize="true"
-		user_resize="false"
-		visible="true"
-		height="75"-->
-		<!--/layout_panel>
-		</layout_stack-->
-	
-	</panel>
+        border="true"
+        follows="all"
+        label="Clouds"
+        layout="topleft"
+        left="0"
+        help_topic="land_general_tab"
+        name="panel_settings_sky_clouds"
+        top="0">
+    <layout_stack 
+            name="main_ls"
+            follows="all"
+            layout="topleft"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            orientation="hoizontal">
+        <layout_panel
+                name="left_lp"
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="false"
+                visible="true"
+                height="75">
+            <text
+                    name="cloud_coverage_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left ="5"
+                    top="15"
+                    width="100">
+                Cloud Coverage:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_pad="5"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_coverage"
+                    top_delta="0"
+                    width="214"
+                    can_edit_text="true"/>
+            <text
+                    name="cloud_scale_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="5"
+                    top_delta="15"
+                    width="100">
+                Cloud Scale:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_pad="5"
+                    min_val="0.01"
+                    max_val="3"
+                    name="cloud_scale"
+                    top_delta="0"
+                    width="214"
+                    can_edit_text="true"/>
+            <text
+                    name="cloud_variance_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="5"
+                    top_delta="15"
+                    width="100">
+                Cloud Variance:
+            </text>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_pad="5"
+                    min_val="0"
+                    max_val="1.0"
+                    name="cloud_variance"
+                    top_delta="0"
+                    width="214"
+                    can_edit_text="true"/>
+            <text
+                    name="cloud_scroll_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="5"
+                    top_delta="25"
+                    width="200">
+                    Cloud Scroll:
+            </text>
+            <xy_vector
+            follows="left|top"
+                    name="cloud_scroll_xy"
+                    width="157"
+                    height="178"
+                    visible="true"
+                    left="5"
+                    top_delta="21"
+                    min_val_x="-30"
+                    max_val_x="30"
+                    min_val_y="-30"
+                    max_val_y="30" 
+                    logarithmic="1"/>
+                <text
+                    name="cloud_image_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="180"
+                    top_delta="-20"
+                    width="200">
+                    Cloud Image:
+                </text>
+                <texture_picker
+                height="123"
+                layout="topleft"
+                left_delta="5"
+                name="cloud_map"
+                top_pad="10"
+                width="100"/>
+                <text
+                        name="cloud_color_label"
+                        follows="left|top"
+                        height="10"
+                        layout="topleft"
+                        left_delta="-5"
+                        top_pad="5"
+                        width="80">
+                    Cloud Color:
+                </text>
+                <color_swatch
+                        can_apply_immediately="true"
+                        follows="left|top"
+                        height="25"
+                        label_height="0"
+                        layout="topleft"
+                        left_delta="5"
+                        name="cloud_color"
+                        top_pad="5"
+                        width="60" />                    
+        </layout_panel>
+                <layout_panel
+                name="right_lp"
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="false"
+                visible="true"
+                height="75">
+                <text
+                name="cloud_density_label"
+                follows="left|top"
+                height="10"
+                layout="topleft"
+                    left_delta="15"
+                    top_pad="15"
+                    width="200">
+                    Cloud Density:
+                </text>
+                <slider
+                label="X"
+                decimal_digits="2"
+                follows="left|top"
+                height="16"
+                increment="0.01"
+                initial_value="0"
+                layout="topleft"
+                left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_density_x"
+                    top_delta="20"
+                    width="200"
+                    can_edit_text="true"/>
+                    <slider
+                    label="Y"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_density_y"
+                    top_delta="20"
+                    width="200"
+                    can_edit_text="true"/>
+            <slider
+                    label="D"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="3"
+                    name="cloud_density_d"
+                    top_delta="20"
+                    width="200"
+                    can_edit_text="true"/>
+            <text
+                    name="cloud_detail_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left_delta="-5"
+                    top_delta="35"
+                    width="200">
+                Cloud Detail:
+            </text>
+            <slider
+                    label="X"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_detail_x"
+                    top_delta="20"
+                    width="200"
+                    can_edit_text="true"/>
+            <slider
+                    label="Y"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_detail_y"
+                    top_delta="20"
+                    width="200"
+                    can_edit_text="true"/>
+            <slider
+                    label="D"
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="0"
+                    min_val="0"
+                    max_val="1"
+                    name="cloud_detail_d"
+                    top_delta="20"
+                    width="200"
+                    can_edit_text="true"/>
+        </layout_panel>
+    </layout_stack>
 </panel>                
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 4298aa77d4..ef33ca419c 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -5,10 +5,9 @@
         label="Sun &amp; Moon"
         layout="topleft"
         left="0"
-		height="405"
-		name="panel_settings_sky_hbodies"
+        name="panel_settings_sky_hbodies"
         top="0">
-    <!--layout_stack 
+    <layout_stack 
             name="main_ls"
             follows="all"
             layout="topleft"
@@ -24,8 +23,8 @@
                 user_resize="false"
                 visible="true"
                 name="sun_layout"
-                height="400"-->
-            <!--text
+                height="400">
+            <text
                     name="sun_stars_label"
                     follows="left|top"
                     height="10"
@@ -35,102 +34,17 @@
                     font="SansSerifBold"
                     width="120">
                 Sun &amp; Stars
-            </text-->
-			
-<panel
-	name="P_Sun_Color"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="22"
-	bg_alpha_color="EmphasisColor"
-	border_visible="true"
-	border_thickness="1"
-	background_visible="true">
-	
-		<text
-		name="T_Sun_Header"
-		follows="left|top"
-		layout="topleft"
-		left="5"
-		font="SansSerif"
-		value="Sun &amp; Moon Color"/>
-			
-	</panel>		
-	
-	<panel
-	name="P_Atmos_Settings"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="30"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-			 <text
-                    name="color_label"
-                    follows="left|top"
-                    height="10"
-                    layout="topleft"
-                    left="5"
-                    top_pad="5"
-                    width="50">
-                Color:
             </text>
-            <color_swatch
-                    can_apply_immediately="true"
-                    follows="left|top"
-                    height="25"
-                    label_height="0"
+            <check_box
+                    control_name="sunbeacon"
+                    width="60"
+                    height="16"
+                    label="Show Beacon"
                     layout="topleft"
-                    left_delta="55"
-                    name="sun_moon_color"
-                    top_delta="-5"
-                    width="185" />
-					
-</panel>
-
-<panel
-	name="P_Sun_Header"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="22"
-	bg_alpha_color="EmphasisColor"
-	border_visible="true"
-	border_thickness="1"
-	background_visible="true">
-	
-		<text
-		name="T_Sun_Header"
-		follows="left|top"
-		layout="topleft"
-		left="5"
-		font="SansSerif"
-		value="Sun Settings"/>
-			
-	</panel>	
-
-	<panel
-	name="P_Sun_Setting"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="145"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-            <!--text
+                    name="sunbeacon" 
+                    top_delta="0"
+                    left="180"/>  
+            <text
                     name="position_label"
                     follows="left|top"
                     height="10"
@@ -139,213 +53,188 @@
                     top_delta="20"
                     width="100">
                 Position:
-            </text-->
-            <!--sun_moon_trackball
+            </text>
+            <sun_moon_trackball
                     name="sun_rotation"
                     follows="left|top"
                     left_delta="0"
                     top_delta="15"
                     height="150"
                     width="150"
-                    thumb_mode="sun" /-->
+                    thumb_mode="sun" />
             <text
                     name="image_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
-                    left="5"
-                    top_pad="5"
+                    left_delta="160"
+                    top_delta="-15"
                     width="200">
-                Image:
+                Image and scale:
             </text>
-			
-			<check_box
-                    control_name="sunbeacon"
-                    width="60"
-                    height="16"
-                    label="Show Beacon"
-                    layout="topleft"
-                    name="sunbeacon" 
-                    top_delta="0"
-                    left_delta="145"/> 
-					
             <texture_picker
-                    height="83"
+                    height="123"
                     layout="topleft"
-                    left="5"
+                    left_delta="5"
                     name="sun_image"
-                    top_pad="0"
-                    width="60"/>
-					
-					
-			
-			<slider
-                    label="Scale:"
-					decimal_digits="2"
+                    top_pad="5"
+                    width="100"/>
+            <slider_bar
+                    decimal_digits="2"
                     follows="left|top"
-                    height="16"
-                    top_delta="8"
+                    height="100"
+                    top_delta="0"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left="70"
+                    left_pad="5"
                     min_val="0.25"
                     max_val="20"
                     name="sun_scale"
-                    width="175"
-                    can_edit_text="true"/>
-					
+                    orientation="vertical"
+                    width="16"
+                    can_edit_text="false"/>
+            <text
+                    name="color_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="180"
+                    top_pad="5"
+                    width="80">
+                Color:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="25"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="5"
+                    name="sun_moon_color"
+                    top_pad="5"
+                    width="60" />
+          <text
+            follows="left|top"
+            name="sun_azimuth_label"
+            height="10"
+            layout="topleft"
+            left="20"
+            top_delta="45"
+            width="90">
+            Azimuth:
+          </text>
+          <slider
+            decimal_digits="2"
+            follows="left|top"
+            height="16"
+            increment="0.01"
+            initial_value="0"
+            layout="topleft"
+            left_pad="5"
+            min_val="0"
+            max_val="359.99"
+            name="sun_azimuth"
+            top_delta="0"
+            width="215"
+            can_edit_text="true"/>
+          <text
+            follows="left|top"
+            name="sun_elevation_label"
+            height="10"
+            layout="topleft"
+            left="20"
+            top_delta="22"
+            width="90">
+            Elevation:
+          </text>
+          <slider
+            decimal_digits="2"
+            follows="left|top"
+            height="16"
+            increment="0.01"
+            initial_value="0"
+            layout="topleft"
+            left_pad="5"
+            min_val="-90"
+            max_val="90"
+            name="sun_elevation"
+            top_delta="0"
+            width="215"
+            can_edit_text="true"/>
             <text
                     name="glow_focus_label"
-					follows="left|top"
-					height="15"
-					layout="topleft"
-					left="70"
-					width="50">
-                Focus:
-            </text>		
-			
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="20"
+                    top_delta="22"
+                    width="90">
+                Glow Focus:
+            </text>
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-					layout="topleft"
-                    left="110"
+                    layout="topleft"
+                    left_pad="5"
                     min_val="-2"
                     max_val="2"
                     name="glow_focus"
-                    left_pad="20"
-                    width="135"
+                    top_delta="0"
+                    width="215"
                     can_edit_text="true"/>
-					
-		<text
-		name="glow_size_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="70"
-		width="50">
-		Size:
-		</text>
-			
+            <text
+                    name="glow_size_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="20"
+                    top_delta="22"
+                    width="90">
+                Glow Size:
+            </text>
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-					layout="topleft"
-                    left="110"
+                    layout="topleft"
+                    left_pad="5"
                     min_val="0"
                     max_val="1.99"
                     name="glow_size"
-                    left_pad="2"
-                    width="135"
+                    top_delta="0"
+                    width="215"
                     can_edit_text="true"/>
-           
-		<text
-		name="sun_azimuth_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Azimuth:
-		</text>
-		
-			  <slider
-				decimal_digits="2"
-				follows="left|top"
-				height="16"
-				increment="0.01"
-				initial_value="0"
-				layout="topleft"
-				left="55"
-				min_val="0"
-				max_val="359.99"
-				name="sun_azimuth"
-				left_pad="2"
-				width="190"
-				can_edit_text="true"/>
-				
-			<text
-			name="sun_elevation_label"
-			follows="left|top"
-			height="15"
-			layout="topleft"
-			left="5"
-			width="50">
-			Elevation:
-			</text>
-			
-			  <slider
-				decimal_digits="2"
-				follows="left|top"
-				height="16"
-				increment="0.01"
-				initial_value="0"
-				layout="topleft"
-				left="55"
-				min_val="-90"
-				max_val="90"
-				name="sun_elevation"
-				left_pad="2"
-				width="190"
-				can_edit_text="true"/>
-
-		<text
-		name="star_brightness_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Star Brt:
-		</text>
-		
+            <text
+                    name="star_brightness_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="20"
+                    top_delta="22"
+                    width="90">
+                Star Brightness:
+            </text>
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-					layout="topleft"
-                    left="55"
+                    layout="topleft"
+                    left_pad="5"
                     min_val="0"
                     max_val="500"
                     name="star_brightness"
-                    left_pad="2"
-                    width="190"
-                    can_edit_text="true"/>     
-</panel>
-
-<panel
-	name="P_Moon_Header"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="22"
-	bg_alpha_color="EmphasisColor"
-	border_visible="true"
-	border_thickness="1"
-	background_visible="true">
-
-		<text
-		name="T_Moon_Header"
-		follows="left|top"
-		layout="topleft"
-		left="5"
-		font="SansSerif"
-		value="Moon Settings"/>
-		
-</panel>
-
-					
-        <!--/layout_panel>
+                    top_delta="0"
+                    width="215"
+                    can_edit_text="true"/>                    
+        </layout_panel>
         <layout_panel
                 name="moon_layout"
                 border="true"
@@ -353,8 +242,8 @@
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
-                height="400"-->
-                <!--text
+                height="400">
+                <text
                         name="moon_label"
                         follows="left|top"
                         height="10"
@@ -364,9 +253,17 @@
                         font="SansSerifBold"
                         width="120">
                 Moon
-                </text-->
-
-                <!--text
+                </text>
+                <check_box
+                        control_name="moonbeacon"
+                        width="60"
+                        height="16"
+                        label="Show Beacon"
+                        layout="topleft"
+                        name="moonbeacon" 
+                        top_delta="0"
+                        left="180"/>  
+                <text
                         name="position_label"
                         follows="left|top"
                         height="10"
@@ -383,125 +280,73 @@
                             top_delta="15"
                             height="150"
                             width="150"
-                            thumb_mode="moon" /-->
-	<panel
-	name="P_Moon_Setting"
-	follows="left|top"
-	layout="topleft"
-	top_pad="5"
-	left="0"
-	width="250"
-	height="125"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">							
-							
+                            thumb_mode="moon" />
                     <text
                             name="moon_image_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left="5"
-                            top_pad="5"
+                            left_delta="160"
+                            top_delta="-15"
                             width="200">
-                        Image:
+                        Image and scale:
                     </text>
-					
-					<check_box
-                        control_name="moonbeacon"
-                        width="60"
-                        height="16"
-                        label="Show Beacon"
-                        layout="topleft"
-                        name="moonbeacon" 
-                        top_delta="0"
-                        left="145"/>  
-						
                     <texture_picker
-                            height="83"
+                            height="123"
                             layout="topleft"
-                            left="5"
+                            left_delta="5"
                             name="moon_image"
-                            top_pad="2"
-                            width="60"/>		
-							
-			  
-					<slider
-					label="Scale:"
-					decimal_digits="2"
-					follows="left|top"
-					height="16"
-					top_delta="27"
-					increment="0.01"
-					initial_value="0"
-					layout="topleft"
-					left="75"
-					min_val="0.25"
-					max_val="20"
-					name="moon_scale"
-					width="170"
-					can_edit_text="true"/>
-					
-		<text
-		name="brightness_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="70"
-		width="50">
-		Bright:
-		</text>
-		
-                  <slider
-                    decimal_digits="2"
+                            top_pad="10"
+                            width="100"/>
+                    <slider_bar
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="100"
+                            top_delta="0"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_pad="5"
+                            min_val="0.25"
+                            max_val="20"
+                            name="moon_scale"
+                            orientation="vertical"
+                            width="16"
+                            can_edit_text="false"/>
+                  <text
                     follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-					layout="topleft"
-                    left="110"
-                    min_val="0.0"
-                    max_val="1.0"
-                    name="moon_brightness"
-					left_pad="10"
-                    width="135"
-                    can_edit_text="true"/>     
-			
-
-		<text
-		name="moon_azimuth_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Azimuth:
-		</text>			
-				  
-                  <slider
-                    decimal_digits="2"
-                    follows="left|top"
-                    height="16"
-                    increment="0.01"
-                    initial_value="0"
-					
+                    name="moon_azimuth_label"
+                    height="10"
                     layout="topleft"
-                    left="55"
+                    left="20"
+                    top_delta="160"
+                    width="90">
+                    Azimuth:
+                  </text>
+                  <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_pad="5"
                     min_val="0"
                     max_val="359.99"
                     name="moon_azimuth"
-                    left_pad="2"
-                    width="190"
+                    top_delta="0"
+                    width="215"
                     can_edit_text="true"/>
-		<text
-		name="moon_elevation_label"
-		follows="left|top"
-		height="15"
-		layout="topleft"
-		left="5"
-		width="50">
-		Elevation:
-		</text>
+                  <text
+                    follows="left|top"
+                    name="moon_elevation_label"
+                    height="10"
+                    layout="topleft"
+                    left="20"
+                    top_delta="22"
+                    width="90">
+                    Elevation:
+                  </text>
                   <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -509,17 +354,37 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left="55"
+                    left_pad="5"
                     min_val="-90"
                     max_val="90"
                     name="moon_elevation"
-                    left_pad="2"
-                    width="190"
+                    top_delta="0"
+                    width="215"
                     can_edit_text="true"/>
-
-
-</panel>
-					
-        <!--/layout_panel>
-    </layout_stack-->
+                  <text
+                    name="brightness_label"
+                    follows="left|top"
+                    height="10"
+                    layout="topleft"
+                    left="20"
+                    top_delta="22"
+                    width="90">
+                    Brightness:
+                  </text>
+                  <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="16"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    left_pad="5"
+                    min_val="0.0"
+                    max_val="1.0"
+                    name="moon_brightness"
+                    top_delta="0"
+                    width="215"
+                    can_edit_text="true"/>                           
+        </layout_panel>
+    </layout_stack>
 </panel>                
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index f08d4d1fd4..1a763859f2 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -2,59 +2,27 @@
 <panel
         border="true"
         follows="all"
-		height="440"
-		width="250"
         label="Water"
         layout="topleft"
         left="0"
         name="panel_settings_water"
         top="0">    
-		
-<!--
-
-<layout_stack name="water_stack1"
-follows="all"
-layout="topleft"
-left="5"
-top="5"
-right="-5"
-bottom="-5"
-orientation="vertical">
-<layout_panel
-name="lp_top"
-border="true"
-bevel_style="in"
-auto_resize="false"
-user_resize="false"
-visible="true"
-height="105">
-
--->
-
-<!--tab_container
-enabled="true"
-follows="left|top"
-height="275"
-left="0"
-width="250"
-top_pad="0"
-tab_position="top"-->
-
-	<panel
-	name="P_Wave_Fog"
-	label="Fog"
-	follows="left|top"
-	layout="topleft"
-	top_pad="0"
-	left="0"
-	width="250"
-	height="70"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-<!--
- 
+    <layout_stack name="water_stack1"
+            follows="all"
+            layout="topleft"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            orientation="vertical">
+        <layout_panel
+                name="lp_top"
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="false"
+                visible="true"
+                height="105">
             <text
                     name="water_fog_label"
                     follows="left|top"
@@ -62,7 +30,7 @@ tab_position="top"-->
                     font="SansSerif"
                     layout="topleft"
                     left="5"
-                    top_pad="5"
+                    top="5"
                     width="215">
                 Water Fog:
             </text>
@@ -71,203 +39,111 @@ tab_position="top"-->
                     follows="left|top"
                     height="10"
                     layout="left|top"
-                    left="5"
-                    top_pad="5"
+                    left_delta="15"
+                    top_delta="0"
                     width="60">
                 Color:
             </text>
-
--->			
-
-				<color_swatch
-				 can_apply_immediately="true"
-				 follows="left|top"
-				 height="40"
-				 label_height="0"
-				 layout="topleft"
-				 left="20"
-				 name="water_fog_color"
-				 top_pad="5"
-				 width="90"/>
-				 
-				 <texture_picker
-				 height="60"
-				 layout="topleft"
-				 left_pad="40"
-				 name="water_normal_map"
-				 top_delta="0"
-				 width="60"/>
-				
-				<text
-				 follows="top|left"
-				 height="20"
-				 font="SansSerifSmall"
-				 layout="topleft"
-				 left="20"
-				 name="water_fog_label"
-				 top_pad="-13"
-				 width="110"
-				 tool_tip="Water Fog Color - This changes the color of the volume tint of the water, essentially defining the color of the water itself. If your water has no fog, it will appear crystal clear and colorless."
-				 word_wrap="true">
-					Water Fog Color
-				</text>
-				
-				<text
-				 follows="left|top|right"
-				 font="SansSerifSmall"
-				 height="20"
-				 layout="topleft"
-				 left_pad="20"
-				 name="normal_map_label"
-				 top_delta="0"
-				 tool_tip="Normal Map - Image used for determining reflections and refractions. Any texture may be used for this setting- but true normal maps work best. Try snake skin, tiles, or any other normal map for some wacky effects!"
-				 width="100">
-					Normal Map
-				</text>
-
-
-
-</panel>
-
-
-	<panel
-	name="P_Wave_Fog"
-	label="Fog"
-	follows="left|top"
-	layout="topleft"
-	top_pad="0"
-	left="0"
-	width="250"
-	height="80"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-
-
-					
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="water_fog_color"
+                    top_pad="5"
+                    width="60" />
             <text
-			name="density_exponent_label"
-			follows="left|top"
-			height="15"
-			layout="topleft"
-			left="5"
-			width="50">
-			Density:
+                    name="density_exponent_label"
+                    follows="left|top"
+                    height="10"
+                    top_delta="-15"
+                    left_delta="80"
+                    width="150">
+                Density Exponent:
             </text>
-
             <slider
                     decimal_digits="1"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-					layout="topleft"
-                    left="55"
+                    layout="top"
+                    left_delta="15"
                     min_val="-10"
                     max_val="10"
                     name="water_fog_density"
-                    left_pad="5"
-                    width="190"
+                    top_delta="5"
+                    width="150"
                     can_edit_text="true"/>
-		
-					
-			<text
-			name="underwater_modifier_label"
-			follows="left|top"
-			height="15"
-			layout="topleft"
-			left="5"
-			width="50">
-			Modifier:</text>
-	
-				
+            <text
+                    name="underwater_modifier_label"
+                    follows="left|top"
+                    height="10"
+                    top_delta="25"
+                    left_delta="-15"
+                    width="150">
+                Underwater Modifier:</text>
             <slider
                     decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
-				    layout="topleft"
-                    left="55"
+                    layout="top"
+                    left_delta="15"
                     min_val="0.0"
                     max_val="20.0"
                     name="water_underwater_mod"
-                    left_pad="5"
-                    width="190"
+                    top_delta="20"
+                    width="150"
                     can_edit_text="true"/>
-					
-                   
-			<text
-			name="FresnelScaleText"
-			follows="left|top"
-			height="15"
-			layout="topleft"
-			left="5"
-			width="50">
-			Fres. Scale:
-			</text>
-
-
+                    
+                    <text
+                            follows="left|top|right"
+                            height="10"
+                            layout="topleft"
+                            left_delta="165"
+                            name="FresnelScaleText"
+                            top_delta="-53"
+                            width="150">
+                        Fresnel Scale:
+                    </text>
                     <slider
                             decimal_digits="2"
                             follows="left|top"
                             height="16"
                             increment="0.01"
                             initial_value="0.7"
-						    layout="topleft"
-                            left="55"
+                            layout="topleft"
+                            left_delta="5"
                             name="water_fresnel_scale"
-                            left_pad="5"
-                            width="190"
+                            top_delta="15"
+                            width="150"
                             can_edit_text="true"/>
-							
-
-							
-			<text
-			name="FresnelOffsetText"
-			follows="left|top"
-			height="15"
-			layout="topleft"
-			left="5"
-			width="50">
-			Fres. Offset:
-			</text>
-
-					
+                    <text
+                            follows="left|top|right"
+                            layout="topleft"
+                            left_delta="-5"
+                            name="FresnelOffsetText"
+                            top_delta="25"
+                            width="150">
+                        Fresnel Offset:
+                    </text>
                     <slider
                             decimal_digits="2"
                             follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
                             height="16"
-						    layout="topleft"
-                            left="55"
+                            layout="topleft"
+                            left_delta="5"
                             name="water_fresnel_offset"
-                            left_pad="5"
-                            width="190"
+                            top_pad="5"
+                            width="150"
                             can_edit_text="true"/>
- 
-
-
-
-	</panel>
- 
-	<panel
-	name="P_Water_Wave"
-	follows="left|top"
-	label="Wave"
-	layout="topleft"
-	top_pad="0"
-	left="0"
-	width="250"
-	height="210"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">	 
-
-	
-<!--
-					
+                    
         </layout_panel>
         <layout_panel
                 name="lp_bottom"
@@ -290,10 +166,23 @@ tab_position="top"-->
                         visible="true"
                         min_width="460"
                         width="50">
-						
--->
-
-
+                    <text
+                            name="normal_map_label"
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left="15"
+                            top="5"
+                            width="215">
+                        Normal Map
+                    </text>
+                    <texture_picker
+                            height="84"
+                            layout="topleft"
+                            left_delta="0"
+                            name="water_normal_map"
+                            top_pad="5"
+                            width="61"/>
 
                     <text
                             name="large_wave_speed_label"
@@ -301,29 +190,18 @@ tab_position="top"-->
                             height="16"
                             width="120"
                             layout="topleft"
-                            top_pad="5"
-                            left="5">
+                            top_delta="-20"
+                            left_delta="175">
                         Large Wave Speed
                     </text>
-				
-					<text
-                            name="small_wave_speed_label"
-                            follows="left|top"
-                            height="16"
-                            layout="topleft"
-                            top_delta="0"
-                            left_pad="5">
-                        Small Wave Speed
-                    </text>
-					
                     <xy_vector
                         follows="top|left"
                         name="water_wave1_xy"
-                        width="100"
-                        height="105"
+                        width="120"
+                        height="145"
                         visible="true"
-                        left="5"
-                        top_pad="0"
+                        left_delta="0"
+                        top_delta="20"
                         min_val_x="-20"
                         max_val_x="20"
                         increment_x="0.01f"
@@ -332,14 +210,23 @@ tab_position="top"-->
                         increment_y="0.01f"
                         arrow_color="white"/>
                     
+                    <text
+                            name="small_wave_speed_label"
+                            follows="left|top"
+                            height="16"
+                            layout="topleft"
+                            top_delta="-20"
+                            left_delta="140">
+                        Small Wave Speed
+                    </text>
                     <xy_vector
                         follows="top|left"
                         name="water_wave2_xy"
-                        width="100"
-                        height="105"
+                        width="120"
+                        height="145"
                         visible="true"
-                        left_pad="25"
-                        top_delta="0"
+                        left_delta="0"
+                        top_delta="20"
                         min_val_x="-20"
                         max_val_x="20"
                         min_val_y="-20"
@@ -354,7 +241,7 @@ tab_position="top"-->
                             height="16"
                             layout="topleft"
                             left="10"
-                            top_pad="5"
+                            top="90"
                             width="215">
                         Reflection Wavelet Scale
                     </text>
@@ -366,11 +253,11 @@ tab_position="top"-->
                             initial_value="0.7"
                             layout="topleft"
                             label="X:"
-                            left="5"
+                            left_delta="10"
                             max_val="10"
                             name="water_normal_scale_x"
-                            top_pad="0"
-                            width="240"
+                            top_pad="5"
+                            width="150"
                             can_edit_text="true"/>
                     <slider
                             decimal_digits="1"
@@ -379,12 +266,11 @@ tab_position="top"-->
                             initial_value="0.7"
                             height="16"
                             layout="topleft"
-							left="5"
                             max_val="10"
                             name="water_normal_scale_y"
-                            top_pad="5"
+                            top_pad="6"
                             label="Y:"
-                            width="240"
+                            width="150"
                             can_edit_text="true"/>
                     <slider
                             decimal_digits="1"
@@ -393,16 +279,13 @@ tab_position="top"-->
                             initial_value="0.7"
                             height="16"
                             layout="topleft"
-							left="5"
                             max_val="10"
                             name="water_normal_scale_z"
-                            top_pad="5"
+                            top_pad="6"
                             label="Z:"
-                            width="240"
+                            width="150"
                             can_edit_text="true"/>                            
-
-<!--
-           
+                        
                 </layout_panel>
                 <layout_panel
                         name="lp_right"
@@ -412,30 +295,6 @@ tab_position="top"-->
                         user_resize="false"
                         width="50"
                         visible="true">
-						
--->
-
-
-
-	</panel>
-
-	<panel
-	name="P_Water_Reflection"
-	label="Refraction"
-	follows="left|top"
-	layout="topleft"
-	top_pad="0"
-	left="0"
-	width="250"
-	height="70"
-	border_visible="true"
-	bevel_style="in"
-	background_visible="true">
-	
-	
-
-
-<!--
                     <text
                             name="refraction_and_blur_label"
                             follows="left|top"
@@ -443,23 +302,20 @@ tab_position="top"-->
                             font="SansSerif"
                             layout="topleft"
                             left="5"
-                            top_pad="5"
+                            top="5"
                             width="215">
                         Refraction And Blur:
                     </text>
-					
--->
-					
-			<text
-			name="refraction_scale_above_label"
-			follows="left|top"
-			height="15"
-			layout="topleft"
-			left="5"
-			width="100">
-			Refract Above:
-			</text>
-				
+                    <text
+                            name="refraction_scale_above_label"
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            top_delta="25"
+                            left_delta="5"
+                            width="215">
+                        Refraction Scale (Above)
+                    </text>
                     <slider
                             control_name="water_scale_above"
                             decimal_digits="2"
@@ -467,28 +323,26 @@ tab_position="top"-->
                             increment="0.01"
                             initial_value="0.1"
                             height="16"
-							layout="topleft"
-                            left="95"
+                            layout="topleft"
+                            left_delta="5"
                             min_val="0"
                             max_val="3"
                             name="water_scale_above"
-                            left_pad="5"
-                            width="150"
+                            top_pad="5"
+                            width="200"
                             can_edit_text="true" />
-                    
-
-					
-					<text
+                    <text
                             name="refraction_scale_below_label"
-							follows="left|top"
-							height="15"
-							layout="topleft"
-							left="5"
-							width="100">
-                        Refract Below:
+                            type="string"
+                            length="1"
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_pad="5"
+                            width="215">
+                        Refraction Scale (Below)
                     </text>
-
-					
                     <slider
                             control_name="water_scale_below"
                             decimal_digits="2"
@@ -496,54 +350,41 @@ tab_position="top"-->
                             height="16"
                             increment="0.01"
                             initial_value="0"
-						    layout="topleft"
-                            left="95"
+                            layout="topleft"
+                            left_delta="5"
                             min_val="0"
                             max_val="3"
                             name="water_scale_below"
-                            left_pad="5"
-                            width="150"
+                            top_pad="5"
+                            width="200"
                             can_edit_text="true"/>
-							
-		
-							
-				<text
-				name="blur_multiplier_label"
-				follows="left|top"
-				height="15"
-				layout="topleft"
-				left="5"
-				width="100">
-				Blur Multiplier
-				</text>
-					
-
-				
+                    <text
+                            name="blur_multiplier_label"
+                            follows="left|top|right"
+                            font="SansSerif"
+                            height="16"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_pad="5"
+                            width="215">
+                        Blur Multiplier
+                    </text>
                     <slider
                             control_name="water_blur_multip"
                             follows="left|top"
                             height="16"
                             increment="0.001"
                             initial_value="0"
-						    layout="topleft"
-                            left="95"
+                            layout="topleft"
+                            left_delta="5"
                             min_val="-0.5"
                             max_val="0.5"
                             name="water_blur_multip"
-                            left_pad="5"
-                            width="150"
+                            top_pad="5"
+                            width="200"
                             can_edit_text="true"/>
-
-	</panel>
-						
-						
-<!--
-							
                 </layout_panel>
             </layout_stack>
         </layout_panel>
     </layout_stack>
-	
--->	
-
 </panel>     

From e594db10c185ff243a4b7ea001603560e8fa9caf Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 16 Nov 2022 20:40:13 +0100
Subject: [PATCH 13/22] FIRE-32432 Russian translation update, by Romka
 Swallowtail (coalesced objects)

---
 indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml    | 1 +
 .../newview/skins/default/xui/ru/menu_inventory_gear_default.xml | 1 +
 indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
index 4add688fca..a5d12fe212 100644
--- a/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
@@ -74,6 +74,7 @@
 			<menu_item_check name="inventory_filter_only_modify" label="Только изменяемое"/>
 			<menu_item_check name="inventory_filter_only_copy" label="Только копируемое"/>
 			<menu_item_check name="inventory_filter_only_transfer" label="Только передаваемое"/>
+			<menu_item_check name="inventory_filter_coalesced_objects_only" label="Только объединенные"/>
 		</menu>
 	</menu_bar>
 	<filter_editor label="Фильтр" name="inventory search editor" tool_tip="Напишите одно или несколько слов для поиска. Для разделения используйте '+' "/>
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
index 620a71305d..2d00737a20 100644
--- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
@@ -29,5 +29,6 @@
 	<menu_item_check name="inventory_filter_only_modify" label="Только изменяемое"/>
 	<menu_item_check name="inventory_filter_only_copy" label="Только копируемое"/>
 	<menu_item_check name="inventory_filter_only_transfer" label="Показать передаваемое"/>
+	<menu_item_check name="inventory_filter_coalesced_objects_only" label="Только объединенные"/>
 	<menu_item_call label="Очистить корзину" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml
index 8b1e93da5d..5822cb9001 100644
--- a/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml
@@ -70,6 +70,7 @@
 			<menu_item_check name="inventory_filter_only_modify" label="Только изменяемые"/>
 			<menu_item_check name="inventory_filter_only_copy" label="Только копируемые"/>
 			<menu_item_check name="inventory_filter_only_transfer" label="Только передаваемые"/>
+			<menu_item_check name="inventory_filter_coalesced_objects_only" label="Только объединенные"/>
 		</menu>
 	</menu_bar>
 	<filter_editor label="Фильтр" name="inventory search editor" tool_tip="Напишите одно или несколько слов для поиска. Для разделения используйте '+' "/>

From d5ed58a70e67b0f5c15dc7023122704c9d00e001 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 17 Nov 2022 21:59:22 +0100
Subject: [PATCH 14/22] Fix line widths: line widths > 1.0 are deprecated in
 current core profile, but not invalid; checking valid range should be
 sufficient if line widths > 1.0 will ever get removed in a future OGL version

---
 indra/llrender/llrender.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index dad8d8c407..16acf1a761 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -911,13 +911,13 @@ void LLRender::init(bool needs_vertex_buffer)
     }
 
 	// <FS:Ansariel> Don't ignore OpenGL max line width
-	GLint range[2];
-	glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, range);
+	GLfloat range[2];
+	glGetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, range);
 	stop_glerror();
-	mMaxLineWidthAliased = F32(range[1]);
-	glGetIntegerv(GL_SMOOTH_LINE_WIDTH_RANGE, range);
+	mMaxLineWidthAliased = range[1];
+	glGetFloatv(GL_SMOOTH_LINE_WIDTH_RANGE, range);
 	stop_glerror();
-	mMaxLineWidthSmooth = F32(range[1]);
+	mMaxLineWidthSmooth = range[1];
 	// </FS:Ansariel>
 }
 
@@ -1558,11 +1558,7 @@ void LLRender::setAmbientLightColor(const LLColor4& color)
 // <FS> Line width OGL core profile fix by Rye Mutt
 void LLRender::setLineWidth(F32 line_width)
 {
-	if (LLRender::sGLCoreProfile)
-	{
-		line_width = 1.f;
-	}
-	else if (line_width > 1.f)
+	if (line_width > 1.f)
 	{
 		line_width = llmin(line_width, glIsEnabled(GL_LINE_SMOOTH) ? mMaxLineWidthSmooth : mMaxLineWidthAliased);
 	}

From 4a33a0edb21a40cdeefd47ea06891257d22eafe1 Mon Sep 17 00:00:00 2001
From: Kyler Eastridge <felix.wolfz@gmail.com>
Date: Fri, 18 Nov 2022 06:22:43 -0500
Subject: [PATCH 15/22] Fix readme logo for dark theme sites

---
 README.md            |   6 +++++-
 doc/sl-logo-dark.png | Bin 0 -> 18028 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 doc/sl-logo-dark.png

diff --git a/README.md b/README.md
index 8813c25228..c57140af9c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
-![Second Life Logo](doc/sl-logo.png)
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="doc/sl-logo-dark.png">
+  <source media="(prefers-color-scheme: light)" srcset="doc/sl-logo.png">
+  <img alt="Second Life Logo" src="doc/sl-logo.png">
+</picture>
 
 **[Second Life][] is a free 3D virtual world where users can create, connect and chat with others from around the
 world.** This repository contains the source code for the official client.
diff --git a/doc/sl-logo-dark.png b/doc/sl-logo-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa9ef32aea03eef5d740df05964bb60ddd8b05fd
GIT binary patch
literal 18028
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
RwtWX6FRcQuk~I48zW_qg{=NVJ

literal 0
HcmV?d00001


From 35d2771cd34253c34df8f0b7bc76c7252159c568 Mon Sep 17 00:00:00 2001
From: Kyler Eastridge <felix.wolfz@gmail.com>
Date: Fri, 18 Nov 2022 06:23:11 -0500
Subject: [PATCH 16/22] Fix spelling error on license file name

---
 doc/{LGPL-licence.txt => LGPL-license.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename doc/{LGPL-licence.txt => LGPL-license.txt} (100%)

diff --git a/doc/LGPL-licence.txt b/doc/LGPL-license.txt
similarity index 100%
rename from doc/LGPL-licence.txt
rename to doc/LGPL-license.txt

From 14f34041b805ff2cdeeb6e22e936bee1a0fc5326 Mon Sep 17 00:00:00 2001
From: Kyler Eastridge <felix.wolfz@gmail.com>
Date: Fri, 18 Nov 2022 06:23:31 -0500
Subject: [PATCH 17/22] Add copy of license to root directory so it is
 recognized by gh

---
 LICENSE.txt | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 502 insertions(+)
 create mode 100755 LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100755
index 0000000000..4362b49151
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

From eaf55065e29c6c55f758a651f606339181e4e230 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Fri, 18 Nov 2022 07:30:38 -0800
Subject: [PATCH 18/22] Add CLA bot

---
 .github/workflows/cla.yaml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/cla.yaml

diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
new file mode 100644
index 0000000000..fa180c66c9
--- /dev/null
+++ b/.github/workflows/cla.yaml
@@ -0,0 +1,25 @@
+name: Check CLA
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened, closed, synchronize]
+
+jobs:
+  cla:
+    name: Check CLA
+    runs-on: ubuntu-latest
+    steps:
+      - name: CLA Assistant
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        uses: secondlife-3p/contributor-assistant@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.SHARED_CLA_TOKEN }}
+        with:
+          branch: main
+          path-to-document: https://github.com/secondlife/cla/blob/master/CLA.md
+          path-to-signatures: signatures.json
+          remote-organization-name: secondlife
+          remote-repository-name: cla-signatures

From e75104b06633ee95ee86516d71c351ebb1aae593 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Fri, 18 Nov 2022 07:38:47 -0800
Subject: [PATCH 19/22] Add automatic PR labels

---
 .github/labeler.yaml         | 78 ++++++++++++++++++++++++++++++++++++
 .github/workflows/label.yaml | 15 +++++++
 2 files changed, 93 insertions(+)
 create mode 100644 .github/labeler.yaml
 create mode 100644 .github/workflows/label.yaml

diff --git a/.github/labeler.yaml b/.github/labeler.yaml
new file mode 100644
index 0000000000..d31a361baf
--- /dev/null
+++ b/.github/labeler.yaml
@@ -0,0 +1,78 @@
+llappearance:
+  - indra/llappearance/**/*
+  
+llaudio:
+  - indra/llaudio/**/*
+
+llcharacter:
+  - indra/llcharacter/**/*
+
+llcommon:
+  - indra/llcommon/**/*
+
+llcorehttp:
+  - indra/llcorehttp/**/*
+
+llcrashlogger:
+  - indra/llcrashlogger/**/*
+
+llfilesystem:
+  - indra/llfilesystem/**/*
+
+llimage:
+  - indra/llimage/**/*
+
+llimagej2coj:
+  - indra/llimagej2coj/**/*
+
+llinventory:
+  - indra/llinventory/**/*
+
+llkdu:
+  - indra/llkdu/**/*
+
+llmath:
+  - indra/llmath/**/*
+
+llmeshoptimizer:
+  - indra/llmeshoptimizer/**/*
+
+llmessage:
+  - indra/llmessage/**/*
+
+llplugin:
+  - indra/llplugin/**/*
+
+llprimitive:
+  - indra/llprimitive/**/*
+
+llrender:
+  - indra/llrender/**/*
+
+llui:
+  - indra/llui/**/*
+
+llwindow:
+  - indra/llwindow/**/*
+
+llxml:
+  - indra/llxml/**/*
+
+cmake:
+  - '**/*.cmake'
+  - '**/*/cmake/*'
+  - '**/CMakeLists.txt'
+
+python:
+  - '**/*.py'
+
+c/cpp:
+  - '**/*.c'
+  - '**/*.cpp'
+  - '**/*.cxx'
+  - '**/*.h'
+  - '**/*.hpp'
+  - '**/*.hxx'
+  - '**/*.i'
+  - '**/*.inl'
+  - '**/*.y'
diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml
new file mode 100644
index 0000000000..6e41d8aa2d
--- /dev/null
+++ b/.github/workflows/label.yaml
@@ -0,0 +1,15 @@
+name: Pull Request Labeler
+on:
+  - pull_request_target
+
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v4
+        with:
+          configuration-path: .github/labeler.yaml
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

From ee37ea4aa751de128ce51f59260716d8ee8ee6ed Mon Sep 17 00:00:00 2001
From: Kyler Eastridge <felix.wolfz@gmail.com>
Date: Fri, 18 Nov 2022 17:10:03 -0500
Subject: [PATCH 20/22] Renamed LICENSE.txt to follow naming scheme of other
 repos

---
 LICENSE.txt => LICENSE | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE.txt => LICENSE (100%)

diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE

From 7be4e2da47cc9a4a3f8569dc7d70c0252a860be6 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 20 Nov 2022 22:34:00 +0100
Subject: [PATCH 21/22] FIRE-32446 French translation update, by Laurent Bechir

---
 .../skins/default/xui/fr/menu_inventory_gear_default.xml     | 1 +
 indra/newview/skins/default/xui/fr/menu_mini_map.xml         | 5 ++++-
 indra/newview/skins/vintage/xui/fr/panel_main_inventory.xml  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
index da39ae8a42..fff1c3c286 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
@@ -30,5 +30,6 @@
 	<menu_item_check name="inventory_filter_only_modify" label="Uniquement les éléments modifiables"/>
 	<menu_item_check name="inventory_filter_only_copy" label="Uniquement les éléments copiables"/>
 	<menu_item_check name="inventory_filter_only_transfer" label="Uniquement les éléments transférables"/>
+	<menu_item_check name="inventory_filter_coalesced_objects_only" label="Uniquement les éléments regroupés"/>
 	<menu_item_call label="Vider la corbeille" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
index db2e2a3fab..691fc0e922 100644
--- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
@@ -55,14 +55,17 @@
 		<menu_item_check label="Textures du terrain" name="Terrain Textures"/>
 		<menu_item_check label="Textures de la carte" name="World Map Textures"/>
 	</menu>
-	<menu_item_check label="Rotation automatique" name="Rotate Map"/>
+	<menu_item_check label="Nord en haut" name="North at top" />
+	<menu_item_check label="Caméra en haut" name="Camera at top" />
 	<menu_item_check label="Centrage automatique" name="Auto Center"/>
+	<menu_item_call label="Recentrer la carte" name="Re-center map" />
 	<menu label="Portée des discussions" name="Chat Distance Rings Menu">
 		<menu_item_check label="Montrer la portée des discussions" name="Chat Distance Rings"/>
 		<menu_item_check label="Montrer la portée des murmures" name="Whisper Distance Ring"/>
 		<menu_item_check label="Montrer la portée des discussions" name="Chat Distance Ring"/>
 		<menu_item_check label="Montrer la portée des cris" name="Shout Distance Ring"/>
 	</menu>
+	<menu_item_call label="À propos du terrain" name="About Land" />
 	<menu_item_call label="Profil du lieu" name="Place Profile"/>
 	<menu_item_call label="Carte du Monde" name="World Map"/>
 </menu>
diff --git a/indra/newview/skins/vintage/xui/fr/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/fr/panel_main_inventory.xml
index c9175a8ee6..2f985e7d4f 100644
--- a/indra/newview/skins/vintage/xui/fr/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/fr/panel_main_inventory.xml
@@ -73,7 +73,7 @@
 			<menu_item_check name="inventory_filter_only_modify" label="Modifiables uniquement" />
 			<menu_item_check name="inventory_filter_only_copy" label="Seulement copiables" />
 			<menu_item_check name="inventory_filter_only_transfer" label="Seulement transférables" />
-			<menu_item_check name="inventory_show_partial_results" label="Afficher les résultats partiels de la recherche" />
+			<menu_item_check name="inventory_filter_coalesced_objects_only" label="Uniquement les éléments regroupés"/>
 		</menu>
 	</menu_bar>
 	<filter_editor label="Inventaire de filtres" name="inventory search editor" tool_tip="Saisissez un ou plusieurs mots à rechercher, en les séparant par un signe '+' "/>

From 026b8ff411fb206418d2b981059f51a72d18d338 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 21 Nov 2022 20:40:50 +0100
Subject: [PATCH 22/22] Update URL of message template

---
 indra/cmake/Variables.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 6f48f36ecc..0dbb34e019 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -60,7 +60,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
   set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
 endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
 set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py")
-set(TEMPLATE_VERIFIER_MASTER_URL "https://bitbucket.org/lindenlab/master-message-template-git/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
+set(TEMPLATE_VERIFIER_MASTER_URL "https://github.com/secondlife/master-message-template/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
 
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING