Merge remote-tracking branch 'origin/main' into DRTVWR-489

# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/llxml/llcontrol.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llsceneview.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml

1 files changed, 62 insertions, 10 deletions

diff --git a/indra/newview/skins/default/xui/ja/panel_settings_water.xml b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
index 20341fcb8d..ead1ca9b2f 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
@@ -1,17 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="水" name="panel_settings_water">
-	<layout_stack name="water_stack1">
-		<layout_panel>
-			<text name="FresnelOffsetText">
-				フレネル・オフセット：
+	<layout_stack name="water_stack1" follows="all" layout="topleft" left="5" top="5" right="-5" bottom="-5" orientation="vertical">
+		<layout_panel border="true" bevel_style="in" auto_resize="false" user_resize="false" visible="true" height="105">
+			<text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">
+				水中のフォグ：
 			</text>
+			<text follows="left|top" height="10" layout="left|top" left_delta="15" top_delta="0" width="60">
+				色：
+			</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"/>
+			<text follows="left|top" height="10" top_delta="-15" left_delta="80" width="150">
+				密度指数：
+			</text>
+			<slider decimal_digits="1" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="-10" max_val="10" name="water_fog_density" top_delta="5" width="150" can_edit_text="true"/>
+			<text follows="left|top" height="10" top_delta="25" left_delta="-15" width="150">
+				水中の修飾子：
+			</text>
+			<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="top" left_delta="15" min_val="0.0" max_val="20.0" name="water_underwater_mod" top_delta="20" width="150" can_edit_text="true"/>
+			<text follows="left|top|right" height="10" layout="topleft" left_delta="165" top_delta="-53" width="150">
+				フレネル係数：
+			</text>
+			<slider decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0.7" layout="topleft" left_delta="5" name="water_fresnel_scale" top_delta="15" width="150" can_edit_text="true"/>
+			<text follows="left|top|right" layout="topleft" left_delta="-5" name="FresnelOffsetText" top_delta="25" width="150">
+				フレネルオフセット：
+			</text>
+			<slider decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" left_delta="5" name="water_fresnel_offset" top_pad="5" width="150" can_edit_text="true"/>
 		</layout_panel>
-		<layout_panel>
-			<layout_stack name="water_stack2">
-				<layout_panel>
-					<slider label="X：" name="water_normal_scale_x"/>
-					<slider label="Y：" name="water_normal_scale_y"/>
-					<slider label="Z：" name="water_normal_scale_z"/>
+		<layout_panel auto_resize="true" user_resize="false" visible="true">
+			<layout_stack name="water_stack2" left="5" top="5" right="-5" bottom="-5" follows="left|top|right|bottom" orientation="horizontal">
+				<layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" visible="true" min_width="460" width="50">
+					<text follows="left|top|right" height="16" layout="topleft" left="15" top="5" width="215">
+						ノーマルマップ
+					</text>
+					<texture_picker height="84" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" width="61"/>
+					<text follows="left|top" height="16" width="120" layout="topleft" top_delta="-20" left_delta="175">
+						大波の速度
+					</text>
+					<xy_vector follows="top|left" name="water_wave1_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" increment_x="0.01f" min_val_y="-20" max_val_y="20" increment_y="0.01f" arrow_color="white"/>
+					<text follows="left|top" height="16" layout="topleft" top_delta="-20" left_delta="140">
+						小波の速度
+					</text>
+					<xy_vector follows="top|left" name="water_wave2_xy" width="120" height="145" visible="true" left_delta="0" top_delta="21" min_val_x="-20" max_val_x="20" min_val_y="-20" max_val_y="20" increment_x="0.01f" increment_y="0.01f" arrow_color="white"/>
+					<text follows="left|top|right" height="16" layout="topleft" left="10" top="90" width="215">
+						さざ波の反射係数
+					</text>
+					<slider decimal_digits="1" follows="left|top" increment="0.01" height="16" initial_value="0.7" layout="topleft" label="Ｘ：" left_delta="10" max_val="10" name="water_normal_scale_x" top_pad="5" width="150" can_edit_text="true"/>
+					<slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_y" top_pad="6" label="Ｙ：" width="150" can_edit_text="true"/>
+					<slider decimal_digits="1" follows="left|top" increment="0.01" initial_value="0.7" height="16" layout="topleft" max_val="10" name="water_normal_scale_z" top_pad="6" label="Ｚ：" width="150" can_edit_text="true"/>
+				</layout_panel>
+				<layout_panel border="true" bevel_style="in" auto_resize="true" user_resize="false" width="50" visible="true">
+					<text follows="left|top" height="20" font="SansSerif" layout="topleft" left="5" top="5" width="215">
+						反射とブラー：
+					</text>
+					<text follows="left|top|right" height="16" layout="topleft" top_delta="25" left_delta="5" width="215">
+						反射係数（上）
+					</text>
+					<slider control_name="water_scale_above" decimal_digits="2" follows="left|top" increment="0.01" initial_value="0.1" height="16" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_above" top_pad="5" width="200" can_edit_text="true"/>
+					<text type="string" length="1" follows="left|top|right" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">
+						反射係数（下）
+					</text>
+					<slider control_name="water_scale_below" decimal_digits="2" follows="left|top" height="16" increment="0.01" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="3" name="water_scale_below" top_pad="5" width="200" can_edit_text="true"/>
+					<text follows="left|top|right" font="SansSerif" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">
+						ブラー乗数
+					</text>
+					<slider control_name="water_blur_multip" follows="left|top" height="16" increment="0.001" initial_value="0" layout="topleft" left_delta="5" min_val="-0.5" max_val="0.5" name="water_blur_multip" top_pad="5" width="200" can_edit_text="true"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>