diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
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
Diffstat (limited to 'indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml index 485ebb3e39..6526b2be67 100644 --- a/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml @@ -1,2 +1,28 @@ -<?xml version="1.0" ?> -<densityctrl name="density_ctrl" label="密度"/> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<densityctrl abel="密度" name="density_ctrl"> + <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120"> + 指数項 + </text> + <slider dname="level_exponential"/> + <view left_pad="15" top="15" name="preview_image" height="140" width="140" follows="left|top"/> + <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120"> + 指数尺度係数 + </text> + <slider dname="exponential_scale"/> + <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120"> + 線形項 + </text> + <slider dname="level_linear"/> + <text follows="left|top" height="11" layout="topleft" left="15" top_pad="-5" width="120"> + 定数項 + </text> + <slider dname="level_constant"/> + <text follows="left|top" height="11" layout="topleft" left="15" top_pad="15" width="80"> + 最大高度 + </text> + <slider name="max_altitude"/> + <text follows="left|top" height="11" layout="topleft" name="aniso_factor_label" left="15" top_pad="15" width="80"> + 異方性係数 + </text> + <slider name="aniso_factor"/> +</densityctrl> |