diff options
Diffstat (limited to 'indra/newview/skins/default')
124 files changed, 3444 insertions, 7211 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 973df6998a..76965ad14b 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -133,6 +133,15 @@ name="AvatarListItemIconVoiceLeftColor" reference="AvatarListItemIconOfflineColor" /> <color + name="BadgeImageColor" + value="0.44 0.69 0.56 1.0" /> + <color + name="BadgeBorderColor" + value="0.9 0.9 0.9 1.0" /> + <color + name="BadgeLabelColor" + reference="White" /> + <color name="ButtonBorderColor" reference="Unused?" /> <color @@ -500,22 +509,22 @@ reference="DkGray2" /> <color name="MultiSliderDisabledThumbColor" - reference="Unused?" /> + reference="Black" /> <color name="MultiSliderThumbCenterColor" - reference="Unused?" /> + reference="White" /> <color name="MultiSliderThumbCenterSelectedColor" - reference="Unused?" /> + reference="Green" /> <color name="MultiSliderThumbOutlineColor" reference="Unused?" /> <color name="MultiSliderTrackColor" - reference="Unused?" /> + reference="LtGray" /> <color name="MultiSliderTriangleColor" - reference="Unused?" /> + reference="Yellow" /> <!-- <color name="NameTagBackground" @@ -760,7 +769,7 @@ <color name="MenuBarProjectBgColor" reference="MdBlue" /> - + <color name="MeshImportTableNormalColor" value="1 1 1 1"/> diff --git a/indra/newview/skins/default/textures/icons/Inv_Gift.png b/indra/newview/skins/default/textures/icons/Inv_Gift.png Binary files differnew file mode 100644 index 0000000000..5afe85d72d --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Gift.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png Binary files differnew file mode 100644 index 0000000000..be58114aa1 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png Binary files differnew file mode 100644 index 0000000000..e6b9480ab1 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On.png b/indra/newview/skins/default/textures/icons/OutboxPush_On.png Binary files differnew file mode 100644 index 0000000000..ffda2e92d4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_On.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png Binary files differnew file mode 100644 index 0000000000..6b5911014f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png Binary files differnew file mode 100644 index 0000000000..0e60b417b0 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png Binary files differnew file mode 100644 index 0000000000..9c26b92e73 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png Binary files differnew file mode 100644 index 0000000000..3b5d462975 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png Binary files differnew file mode 100644 index 0000000000..f85be047b0 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png Binary files differnew file mode 100644 index 0000000000..cd4e482216 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png Binary files differnew file mode 100644 index 0000000000..d212a871ce --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png Binary files differnew file mode 100644 index 0000000000..e5b6023e36 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png Binary files differnew file mode 100644 index 0000000000..e1911a092f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png Binary files differnew file mode 100644 index 0000000000..9e59f7843a --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png Binary files differnew file mode 100644 index 0000000000..51e8bff646 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png Binary files differnew file mode 100644 index 0000000000..300e2e69e1 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png Binary files differnew file mode 100644 index 0000000000..32fb236381 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png Binary files differnew file mode 100644 index 0000000000..827f343b1e --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png Binary files differnew file mode 100644 index 0000000000..956e02b14d --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png Binary files differnew file mode 100644 index 0000000000..434caeda8b --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png Binary files differnew file mode 100644 index 0000000000..064687ed0f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png Binary files differnew file mode 100644 index 0000000000..5465650d0c --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Disabled.png b/indra/newview/skins/default/textures/icons/Sync_Disabled.png Binary files differnew file mode 100644 index 0000000000..ca2e8def97 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Enabled.png b/indra/newview/skins/default/textures/icons/Sync_Enabled.png Binary files differnew file mode 100644 index 0000000000..bc236c8b98 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Enabled.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png Binary files differnew file mode 100644 index 0000000000..624e556376 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png Binary files differnew file mode 100644 index 0000000000..5769803b3f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png Binary files differnew file mode 100644 index 0000000000..92d4bfb020 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png Binary files differnew file mode 100644 index 0000000000..6d43eb3a9f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png Binary files differnew file mode 100644 index 0000000000..766d063c99 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png Binary files differnew file mode 100644 index 0000000000..dfe7f68b72 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index cc7cce99c9..799cd907dc 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,4 +1,4 @@ -<!-- +<!-- This file contains metadata about how to load, display, and scale textures for rendering in the UI. Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer to them by filename (relative to textures directory). @@ -72,8 +72,11 @@ with the same filename but different name <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" /> <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" /> + <texture name="Badge_Background" file_name="widgets/Badge_Background.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" /> + <texture name="Badge_Border" file_name="widgets/Badge_Border.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" /> + <texture name="Blank" file_name="Blank.png" preload="false" /> - + <texture name="BreadCrumbBtn_Left_Disabled" file_name="widgets/BreadCrumbBtn_Left_Disabled.png" preload="false"/> <texture name="BreadCrumbBtn_Left_Off" file_name="widgets/BreadCrumbBtn_Left_Off.png" preload="false"/> <texture name="BreadCrumbBtn_Left_Over" file_name="widgets/BreadCrumbBtn_Left_Over.png" preload="false"/> @@ -88,7 +91,6 @@ with the same filename but different name <texture name="BreadCrumbBtn_Right_Off" file_name="widgets/BreadCrumbBtn_Right_Off.png" preload="false"/> <texture name="BreadCrumbBtn_Right_Over" file_name="widgets/BreadCrumbBtn_Right_Over.png" preload="false"/> <texture name="BreadCrumbBtn_Right_Press" file_name="widgets/BreadCrumbBtn_Right_Press.png" preload="false"/> - <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> @@ -266,6 +268,8 @@ with the same filename but different name <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" /> + <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" /> + <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" /> <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" /> @@ -349,6 +353,23 @@ with the same filename but different name <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" /> <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" /> + <texture name="OutboxPush_Disabled" file_name="icons/OutboxPush_Disabled.png" preload="true" /> + <texture name="OutboxPush_Off" file_name="icons/OutboxPush_Off.png" preload="true" /> + <texture name="OutboxPush_On" file_name="icons/OutboxPush_On.png" preload="true" /> + <texture name="OutboxPush_On_Over" file_name="icons/OutboxPush_On_Over.png" preload="true" /> + <texture name="OutboxPush_Over" file_name="icons/OutboxPush_Over.png" preload="true" /> + <texture name="OutboxPush_Press" file_name="icons/OutboxPush_Press.png" preload="true" /> + <texture name="OutboxPush_Progress_1" file_name="icons/OutboxPush_Progress_1.png" preload="true" /> + <texture name="OutboxPush_Progress_2" file_name="icons/OutboxPush_Progress_2.png" preload="true" /> + <texture name="OutboxPush_Progress_3" file_name="icons/OutboxPush_Progress_3.png" preload="true" /> + <texture name="OutboxPush_Progress_4" file_name="icons/OutboxPush_Progress_4.png" preload="true" /> + <texture name="OutboxPush_Progress_5" file_name="icons/OutboxPush_Progress_5.png" preload="true" /> + <texture name="OutboxPush_Progress_6" file_name="icons/OutboxPush_Progress_6.png" preload="true" /> + <texture name="OutboxPush_Selected" file_name="icons/OutboxPush_Selected.png" preload="true" /> + <texture name="OutboxPush_Selected_Disabled" file_name="icons/OutboxPush_Selected_Disabled.png" preload="true" /> + <texture name="OutboxPush_Selected_Over" file_name="icons/OutboxPush_Selected_Over.png" preload="true" /> + <texture name="OutboxPush_Selected_Press" file_name="icons/OutboxPush_Selected_Press.png" preload="true" /> + <texture name="PanOrbit_Off" file_name="bottomtray/PanOrbit_Off.png" preload="false" /> <texture name="Parcel_Exp_Color" file_name="icons/Parcel_Exp_Color.png" preload="false" /> @@ -369,6 +390,10 @@ with the same filename but different name <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" /> <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" /> <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" /> + <texture name="Parcel_SeeAVsOff_Dark" file_name="icons/Parcel_SeeAVsOff_Dark.png" preload="false" /> + <texture name="Parcel_SeeAVsOn_Dark" file_name="icons/Parcel_SeeAVsOn_Dark.png" preload="false" /> + <texture name="Parcel_SeeAVsOff_Light" file_name="icons/Parcel_SeeAVsOff_Light.png" preload="false" /> + <texture name="Parcel_SeeAVsOn_Light" file_name="icons/Parcel_SeeAVsOn_Light.png" preload="false" /> <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" /> <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" /> @@ -496,6 +521,15 @@ with the same filename but different name <texture name="StopReload_Off" file_name="icons/StopReload_Off.png" preload="false" /> <texture name="StopReload_Over" file_name="icons/StopReload_Over.png" preload="false" /> + <texture name="Sync_Disabled" file_name="icons/Sync_Disabled.png" preload="true" /> + <texture name="Sync_Enabled" file_name="icons/Sync_Enabled.png" preload="true" /> + <texture name="Sync_Progress_1" file_name="icons/Sync_Progress_1.png" preload="true" /> + <texture name="Sync_Progress_2" file_name="icons/Sync_Progress_2.png" preload="true" /> + <texture name="Sync_Progress_3" file_name="icons/Sync_Progress_3.png" preload="true" /> + <texture name="Sync_Progress_4" file_name="icons/Sync_Progress_4.png" preload="true" /> + <texture name="Sync_Progress_5" file_name="icons/Sync_Progress_5.png" preload="true" /> + <texture name="Sync_Progress_6" file_name="icons/Sync_Progress_6.png" preload="true" /> + <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" /> <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" /> <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" /> @@ -649,6 +683,7 @@ with the same filename but different name <texture name="inv_folder_mesh.tga"/> <texture name="inv_item_mesh.tga"/> + <texture name="lag_status_critical.tga" /> <texture name="lag_status_good.tga" /> <texture name="lag_status_warning.tga" /> diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background.png b/indra/newview/skins/default/textures/widgets/Badge_Background.png Binary files differnew file mode 100644 index 0000000000..5089c30312 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Badge_Background.png diff --git a/indra/newview/skins/default/textures/widgets/Badge_Border.png b/indra/newview/skins/default/textures/widgets/Badge_Border.png Binary files differnew file mode 100644 index 0000000000..4b086a63fb --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Badge_Border.png diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png Binary files differnew file mode 100644 index 0000000000..e603c44384 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png Binary files differnew file mode 100644 index 0000000000..fbc164123f --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png diff --git a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml deleted file mode 100644 index ffae3d788f..0000000000 --- a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="DAG CYKLUS OPSÆTNING"> - <tab_container name="Day Cycle Tabs"> - <panel label="Dag cyklus" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <multi_slider label="" name="WLTimeSlider"/> - <multi_slider label="" name="WLDayCycleKeys"/> - <text name="WL12am"> - 00:00 - </text> - <text name="WL3am"> - 03:00 - </text> - <text name="WL6am"> - 06:00 - </text> - <text name="WL9amHash"> - 09:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 00:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Tilføj key" label_selected="Tilføj key" name="WLAddKey"/> - <button label="Slet key" label_selected="Slet key" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Key-frame indstillinger: - </text> - <text name="WLCurKeyTimeText"> - Key tid: - </text> - <spinner label="Timer" name="WLCurKeyHour"/> - <spinner label="Min." name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Key fast indstilling: - </text> - <combo_box label="Faste" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Cycluslængde: - </text> - <spinner label="Timer" name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Sek." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Vis : - </text> - <button label="Afspil" label_selected="Afspil" name="WLAnimSky"/> - <button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Benyt estate tid" label_selected="Gå til estate tid" name="WLUseLindenTime"/> - <button label="Gem test-dag" label_selected="Gem test-dag" name="WLSaveDayCycle"/> - <button label="Hent test-dag" label_selected="Hent test-dag" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/da/floater_env_settings.xml b/indra/newview/skins/default/xui/da/floater_env_settings.xml deleted file mode 100644 index a6fbc05734..0000000000 --- a/indra/newview/skins/default/xui/da/floater_env_settings.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="REDIGERING AF OMGIVELSER"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Tid på -dagen - </text> - <text name="EnvTimeText2"> - 00:00 - </text> - <slider label="" name="EnvTimeSlider"/> - <text name="EnvCloudText"> - Skydække - </text> - <slider label="" name="EnvCloudSlider"/> - <text name="EnvWaterColorText"> - Farve på -vand - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Klik for at åbne farvevælger"/> - <text name="EnvWaterFogText"> - Tåge på -vand - </text> - <slider label="" name="EnvWaterFogSlider"/> - <button label="Benyt tid fra estate" name="EnvUseEstateTimeButton"/> - <button label="Avanceret himmel" name="EnvAdvancedSkyButton"/> - <button label="Avanceret vand" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/da/floater_water.xml b/indra/newview/skins/default/xui/da/floater_water.xml deleted file mode 100644 index aedd1b442c..0000000000 --- a/indra/newview/skins/default/xui/da/floater_water.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="AVANCERET OPSÆTNING AF VAND"> - <text name="KeyFramePresetsText"> - Vand opsætninger: - </text> - <button label="Ny" label_selected="Ny" name="WaterNewPreset"/> - <button label="Gem" label_selected="Gem" name="WaterSavePreset"/> - <button label="Slet" label_selected="Slet" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="INDSTILLINGER" name="Settings"> - <text name="BHText"> - Vandtåge farve - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Klik for at åbne farvevælger"/> - <text name="WaterFogDensText"> - Tåge tæthedskarakteristik - </text> - <button label="?" name="WaterFogDensityHelp"/> - <slider label="" name="WaterFogDensity"/> - <text name="WaterUnderWaterFogModText"> - Tilretning undervandståge - </text> - <button label="?" name="WaterUnderWaterFogModHelp"/> - <slider label="" name="WaterUnderWaterFogMod"/> - <text name="BDensText"> - Lille bølge reflektionsskala - </text> - <button label="?" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <slider label="" name="WaterNormalScaleX"/> - <slider label="" name="WaterNormalScaleY"/> - <slider label="" name="WaterNormalScaleZ"/> - <text name="HDText"> - Spredningsskala - </text> - <button label="?" name="WaterFresnelScaleHelp"/> - <slider label="" name="WaterFresnelScale"/> - <text name="FresnelOffsetText"> - Spredning offset - </text> - <button label="?" name="WaterFresnelOffsetHelp"/> - <slider label="" name="WaterFresnelOffset"/> - <text name="DensMultText"> - Lysbrydning fra oven - </text> - <button label="?" name="WaterScaleAboveHelp"/> - <slider label="" name="WaterScaleAbove"/> - <text name="WaterScaleBelowText"> - Lysbrydning fra neden - </text> - <button label="?" name="WaterScaleBelowHelp"/> - <slider label="" name="WaterScaleBelow"/> - <text name="MaxAltText"> - Udviskning - </text> - <button label="?" name="WaterBlurMultiplierHelp"/> - <slider label="" name="WaterBlurMult"/> - </panel> - <panel label="BILLEDE" name="Waves"> - <text name="BHText"> - Retning for store bølger - </text> - <button label="?" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <slider label="" name="WaterWave1DirX"/> - <slider label="" name="WaterWave1DirY"/> - <text name="BHText2"> - Retning for små bølger - </text> - <button label="?" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <slider label="" name="WaterWave2DirX"/> - <slider label="" name="WaterWave2DirY"/> - <text name="BHText3"> - Tekstur map - </text> - <button label="?" name="WaterNormalMapHelp"/> - <texture_picker label="" name="WaterNormalMap"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/da/floater_windlight_options.xml b/indra/newview/skins/default/xui/da/floater_windlight_options.xml deleted file mode 100644 index 56f94b24e9..0000000000 --- a/indra/newview/skins/default/xui/da/floater_windlight_options.xml +++ /dev/null @@ -1,228 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="WindLight floater" title="AVANCERET OPSÆTNING FOR HIMMEL"> - <text name="KeyFramePresetsText"> - Faste indstillinger: - </text> - <button label="Ny" label_selected="Ny" name="WLNewPreset" /> - <button label="Gem" label_selected="Gem" name="WLSavePreset" /> - <button label="Slet" label_selected="Slet" name="WLDeletePreset" /> - <button label="Dags cyklus" label_selected="Dags cyklus" name="WLDayCycleMenuButton" /> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFÆRE" name="Atmosphere"> - <text name="BHText"> - Blå - horisont - </text> - <button label="?" name="WLBlueHorizonHelp" /> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <slider label="" name="WLBlueHorizonR" /> - <slider label="" name="WLBlueHorizonG" /> - <slider label="" name="WLBlueHorizonB" /> - <slider label="" name="WLBlueHorizonI" /> - <text name="BDensText"> - Dis - horisont - </text> - <button label="?" name="WLHazeHorizonHelp" /> - <slider label="" name="WLHazeHorizon" /> - <text name="BDensText2"> - Blå - tæthed - </text> - <button label="?" name="WLBlueDensityHelp" /> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <slider label="" name="WLBlueDensityR" /> - <slider label="" name="WLBlueDensityG" /> - <slider label="" name="WLBlueDensityB" /> - <slider label="" name="WLBlueDensityI" /> - <text name="HDText"> - Dis - intensitet - </text> - <button label="?" name="WLHazeDensityHelp" /> - <slider label="" name="WLHazeDensity" /> - <text name="DensMultText"> - Densitet faktor - </text> - <button label="?" name="WLDensityMultHelp" /> - <slider label="" name="WLDensityMult" /> - <text name="WLDistanceMultText"> - Distance faktor - </text> - <button label="?" name="WLDistanceMultHelp" /> - <slider label="" name="WLDistanceMult" /> - <text name="MaxAltText"> - Maximum højde - </text> - <button label="?" name="WLMaxAltitudeHelp" /> - <slider label="" name="WLMaxAltitude" /> - </panel> - <panel label="LYS" name="Lighting"> - <text name="SLCText"> - Sol/Måne farve - </text> - <button label="?" name="WLSunlightColorHelp" /> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLSunlightR" /> - <slider label="" name="WLSunlightG" /> - <slider label="" name="WLSunlightB" /> - <slider label="" name="WLSunlightI" /> - <text name="TODText"> - Sol/Måne position - </text> - <button label="?" name="WLTimeOfDayHelp" /> - <slider label="" name="WLSunAngle" /> - <text name="WLAmbientText"> - Omgivende - </text> - <button label="?" name="WLAmbientHelp" /> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <slider label="" name="WLAmbientR" /> - <slider label="" name="WLAmbientG" /> - <slider label="" name="WLAmbientB" /> - <slider label="" name="WLAmbientI" /> - <text name="WLEastAngleText"> - Øst vinkel - </text> - <button label="?" name="WLEastAngleHelp" /> - <slider label="" name="WLEastAngle" /> - <text name="SunGlowText"> - Sol glød - </text> - <button label="?" name="WLSunGlowHelp" /> - <slider label="Fokus " name="WLGlowB" /> - <slider label="Størr. " name="WLGlowR" /> - <text name="SceneGammaText"> - Lysintensitet (gamma) - </text> - <button label="?" name="WLSceneGammaHelp" /> - <slider label="" name="WLGamma" /> - <text name="WLStarText"> - Stjerne intensitet - </text> - <button label="?" name="WLStarBrightnessHelp" /> - <slider label="" name="WLStarAlpha" /> - </panel> - <panel label="SKYER" name="Clouds"> - <text name="WLCloudColorText"> - Farve på skyer - </text> - <button label="?" name="WLCloudColorHelp" /> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLCloudColorR" /> - <slider label="" name="WLCloudColorG" /> - <slider label="" name="WLCloudColorB" /> - <slider label="" name="WLCloudColorI" /> - <text name="WLCloudColorText2"> - Skyer XY/Tæthed - </text> - <button label="?" name="WLCloudDensityHelp" /> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - T - </text> - <slider label="" name="WLCloudX" /> - <slider label="" name="WLCloudY" /> - <slider label="" name="WLCloudDensity" /> - <text name="WLCloudCoverageText"> - Skydække - </text> - <button label="?" name="WLCloudCoverageHelp" /> - <slider label="" name="WLCloudCoverage" /> - <text name="WLCloudScaleText"> - Skystørrelse - </text> - <button label="?" name="WLCloudScaleHelp" /> - <slider label="" name="WLCloudScale" /> - <text name="WLCloudDetailText"> - Sky detaljer(XY/tæthed) - </text> - <button label="?" name="WLCloudDetailHelp" /> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - T - </text> - <slider label="" name="WLCloudDetailX" /> - <slider label="" name="WLCloudDetailY" /> - <slider label="" name="WLCloudDetailDensity" /> - <text name="WLCloudScrollXText"> - Sky drift X - </text> - <button label="?" name="WLCloudScrollXHelp" /> - <check_box label="Lås" name="WLCloudLockX" /> - <slider label="" name="WLCloudScrollX" /> - <text name="WLCloudScrollYText"> - Sky drift Y - </text> - <button label="?" name="WLCloudScrollYHelp" /> - <check_box label="Lås" name="WLCloudLockY" /> - <slider label="" name="WLCloudScrollY" /> - <check_box label="Benyt simple skyer" name="DrawClassicClouds" /> - <button label="?" name="WLClassicCloudsHelp" /> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml index fd287b1a0a..3036f30240 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Gem valgte" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Annullér" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml deleted file mode 100644 index 8599737106..0000000000 --- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="TAGESZYKLUS-EDITOR"> - <tab_container name="Day Cycle Tabs"> - <panel label="Tageszyklus" name="Day Cycle"> - <button label=" ?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 24:00 - </text> - <text name="WL3am"> - 03:00 - </text> - <text name="WL6am"> - 06:00 - </text> - <text name="WL9amHash"> - 09:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 24:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Key hinzu" label_selected="Key hinzu" name="WLAddKey"/> - <button label="Key löschen" label_selected="Key löschen" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Keyframe-Einstellungen: - </text> - <text name="WLCurKeyTimeText"> - Key-Zeit: - </text> - <spinner label="Std." name="WLCurKeyHour"/> - <spinner label="Min." name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Key-Voreinstellung: - </text> - <combo_box label="Voreinstellung" name="WLKeyPresets"/> - <text name="DayCycleText"> - Einrasten: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Zykluslänge: - </text> - <spinner label="Std." name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Sek." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Vorschau: - </text> - <button label="Start" label_selected="Start" name="WLAnimSky"/> - <button label="Stopp" label_selected="Stopp" name="WLStopAnimSky"/> - <button label="Grundbesitzzeit verw" label_selected="Zur Grundbesitzzeit" name="WLUseLindenTime"/> - <button label="Testtag speichern" label_selected="Testtag speichern" name="WLSaveDayCycle"/> - <button label="Testtag laden" label_selected="Testtag laden" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_env_settings.xml b/indra/newview/skins/default/xui/de/floater_env_settings.xml deleted file mode 100644 index 0c78909108..0000000000 --- a/indra/newview/skins/default/xui/de/floater_env_settings.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="UMWELT-EDITOR"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Tageszeit - </text> - <text name="EnvTimeText2"> - 12:00 - </text> - <text name="EnvCloudText"> - Wolkendecke - </text> - <text name="EnvWaterColorText"> - Wasserfarbe - </text> - <color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <text name="EnvWaterFogText"> - Wasser- -trübung - </text> - <button label="Grundbesitzzeit verw." name="EnvUseEstateTimeButton"/> - <button label="Himmel (erweitert)" name="EnvAdvancedSkyButton"/> - <button label="Wasser (erweitert)" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml deleted file mode 100644 index bb0dd9c75d..0000000000 --- a/indra/newview/skins/default/xui/de/floater_water.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="ERWEITERTER WASSER-EDITOR"> - <floater.string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text name="KeyFramePresetsText" width="110"> - Voreinstellungen: - </text> - <combo_box left_delta="110" name="WaterPresetsCombo"/> - <button label="Neu" label_selected="Neu" name="WaterNewPreset"/> - <button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/> - <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="EINSTELLUNGEN" name="Settings"> - <text name="BHText"> - Wassertrübungsfarbe - </text> - <color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <text name="WaterFogDensText"> - Wassertrübungsdichte - </text> - <text name="WaterUnderWaterFogModText"> - Wassertrübungs-Modifikator - </text> - <slider bottom_delta="-34" name="WaterUnderWaterFogMod"/> - <text name="BDensText"> - Reflexionswellengröße - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - Fresnel-Skalierung - </text> - <text name="FresnelOffsetText"> - Fresnel-Versatz - </text> - <text name="DensMultText"> - Brechungsstärke oben - </text> - <text name="WaterScaleBelowText"> - Brechungsstärke unten - </text> - <text name="MaxAltText"> - Mischungsmultiplikator - </text> - </panel> - <panel label="BILD" name="Waves"> - <text name="BHText"> - Richtung große Welle - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Richtung kleine Welle - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Normal-Map - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml deleted file mode 100644 index 5b59336f9d..0000000000 --- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="ERWEITERTER HIMMEL-EDITOR"> - <text name="KeyFramePresetsText"> - Voreinstellungen: - </text> - <button label="Neu" label_selected="Neu" name="WLNewPreset"/> - <button label="Speichern" label_selected="Speichern" name="WLSavePreset"/> - <button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/> - <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSPHÄRE" name="Atmosphere"> - <text name="BHText"> - Horizontfarbe - </text> - <button label=" ?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Horizonttrübung - </text> - <button label=" ?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Farbintensität - </text> - <button label=" ?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Trübungsintensität - </text> - <button label=" ?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Dichtemultiplikator - </text> - <button label=" ?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Entfernungsmultiplikator - </text> - <button label=" ?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Max. Höhe - </text> - <button label=" ?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="LICHT" name="Lighting"> - <text name="SLCText"> - Sonne/Mond-Farbe - </text> - <button label=" ?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Sonne/Mond-Stand - </text> - <button label=" ?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Umgebung - </text> - <button label=" ?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Ostausrichtung - </text> - <button label=" ?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Sonnenleuchtkraft - </text> - <button label=" ?" name="WLSunGlowHelp"/> - <slider label="Fokus " name="WLGlowB"/> - <slider label="Größe " name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma in Szene - </text> - <button label=" ?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Sternenleuchtkraft - </text> - <button label=" ?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="WOLKEN" name="Clouds"> - <text name="WLCloudColorText"> - Wolkenfarbe - </text> - <button label=" ?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Wolken-XY/Dichte - </text> - <button label=" ?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Wolkendichte - </text> - <button label=" ?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Wolkenskalierung - </text> - <button label=" ?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Wolkendetails (XY/Dichte) - </text> - <button label=" ?" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Wolkenbewegung X - </text> - <button label=" ?" name="WLCloudScrollXHelp"/> - <check_box label="Fest" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Wolkenbewegung Y - </text> - <button label=" ?" name="WLCloudScrollYHelp"/> - <check_box label="Fest" name="WLCloudLockY"/> - <check_box label="Klassische Wolken" name="DrawClassicClouds"/> - <button label=" ?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml index 3c56df763d..aafffc7ae3 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Auswahl speichern" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Abbrechen" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index ecd2b119c9..07cb4c12f5 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1205,6 +1205,10 @@ Only large parcels can be listed in search. name="push_restrict_region_text"> No Pushing (Region Override) </panel.string> + <panel.string + name="see_avs_text"> + See and chat with residents on this parcel + </panel.string> <text type="string" length="1" @@ -1314,7 +1318,7 @@ Only large parcels can be listed in search. name="check group scripts" top_delta="0" width="70" /> - <text + <text type="string" text_color="white" length="1" @@ -1515,10 +1519,32 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" + text_color="white" + height="16" + layout="topleft" + left="230" + top="174" + name="allow_label5" + width="278"> + Allow Residents on other parcels to: + </text> + <check_box height="16" + label="See Avatars" + follows="top" layout="topleft" - left="220" - top="180" + left="230" + name="SeeAvatarsCheck" + tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them." + width="120" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="230" + top="230" text_color="white" name="landing_point" word_wrap="true" @@ -1532,7 +1558,7 @@ Only large parcels can be listed in search. label_selected="Set" layout="topleft" name="Set" - right="-68" + left="230" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel." width="50" /> <button @@ -1544,7 +1570,6 @@ Only large parcels can be listed in search. left_pad="5" name="Clear" tool_tip="Clear the landing point" - right="-10" width="55" /> <text type="string" @@ -1553,7 +1578,7 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="220" + left="230" top_pad="10" name="Teleport Routing: " width="200"> @@ -1846,6 +1871,34 @@ Only large parcels can be listed in search. name="check sound local" left_pad="0" width="292" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="Avatar Sounds:" + top_pad="10" + width="100"> + Avatar Sounds: + </text> + <check_box + height="16" + label="Everyone" + layout="topleft" + left_pad="0" + name="all av sound check" + top_delta="0" + width="130" /> + <check_box + height="16" + label="Group" + layout="topleft" + left_pad="0" + name="group av sound check" + top_delta="0" + width="70" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml deleted file mode 100644 index 65e2462ef8..0000000000 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ /dev/null @@ -1,558 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="275" - layout="topleft" - name="Day Cycle Floater" - help_topic="day_cycle_floater" - save_rect="true" - title="DAY CYCLE EDITOR" - width="658"> - <tab_container - follows="left|top" - height="255" - layout="topleft" - left="0" - name="Day Cycle Tabs" - tab_position="top" - top="20" - width="656"> - <panel - border="true" - follows="left|top|right|bottom" - height="255" - label="Day Cycle" - layout="topleft" - left="1" - mouse_opaque="false" - name="Day Cycle" - top="0" - width="654"> - <multi_slider - can_edit_text="true" - control_name="WLTimeSlider" - decimal_digits="0" - draw_track="false" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left="20" - max_sliders="20" - max_val="24" - name="WLTimeSlider" - show_text="false" - top="25" - use_triangle="true" - width="525" /> - <multi_slider - can_edit_text="true" - control_name="WLDayCycleKeys" - decimal_digits="0" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left_delta="0" - max_sliders="20" - max_val="24" - name="WLDayCycleKeys" - show_text="false" - top_pad="15" - width="525" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left="8" - name="WL12am" - top="74" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3am" - top_delta="0" - width="55"> - 3am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6am" - top_delta="0" - width="55"> - 6am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9amHash" - top_delta="0" - width="55"> - 9am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12pmHash" - top_delta="0" - width="55"> - 12pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3pm" - top_delta="0" - width="55"> - 3pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6pm" - top_delta="0" - width="55"> - 6pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9pm" - top_delta="0" - width="55"> - 9pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12am2" - top_delta="0" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left="20" - name="WL12amHash" - top="54" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3amHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6amHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9amHash2" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12pmHash2" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6pmHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12amHash2" - top_delta="-3" - width="6"> - | - </text> - <button - height="20" - label="Add Key" - label_selected="Add Key" - layout="topleft" - left="555" - name="WLAddKey" - top="30" - width="96" /> - <button - height="20" - label="Delete Key" - label_selected="Delete Key" - layout="topleft" - left_delta="0" - name="WLDeleteKey" - top_pad="5" - width="96" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="20" - name="WLCurKeyFrameText" - top="104" - width="235"> - Key Frame Settings: - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText" - top="124" - width="105"> - Key Time: - </text> - <spinner - control_name="WLCurKeyHour" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Hour" - label_width="35" - layout="topleft" - left_delta="20" - max_val="100" - name="WLCurKeyHour" - top_pad="4" - width="74" /> - <spinner - control_name="WLCurKeyMin" - decimal_digits="0" - follows="left|top" - height="16" - increment="5" - initial_value="0" - label="Min" - label_width="45" - layout="topleft" - left_pad="5" - max_val="55" - name="WLCurKeyMin" - top_delta="0" - width="85" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText2" - top="169" - width="185"> - Key Preset: - </text> - <combo_box - height="18" - label="Preset" - layout="topleft" - left_delta="0" - name="WLKeyPresets" - top_pad="7" - width="205" /> - <view_border - bevel_style="none" - follows="top|left" - height="115" - layout="topleft" - left="12" - top="101" - width="240" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="15" - name="DayCycleText" - top="114" - width="120"> - Snap: - </text> - <combo_box - enabled="false" - height="18" - label="5 min" - layout="topleft" - left_delta="0" - name="WLSnapOptions" - top_pad="7" - width="70" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="DayCycleText2" - top_pad="17" - width="120"> - Length of Cycle: - </text> - <spinner - control_name="WLLengthOfDayHour" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Hour" - label_width="33" - layout="topleft" - left_delta="-3" - max_val="100" - name="WLLengthOfDayHour" - top_pad="4" - width="74" /> - <spinner - control_name="WLLengthOfDayMin" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Min" - label_width="25" - layout="topleft" - left_pad="2" - max_val="59" - name="WLLengthOfDayMin" - top_delta="0" - width="65" /> - <spinner - control_name="WLLengthOfDaySec" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="24" - label="Sec" - label_width="25" - layout="topleft" - left_pad="2" - max_val="59" - name="WLLengthOfDaySec" - top_delta="0" - width="65"/> - <text - type="string" - halign="right" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-23" - name="DayCycleText3" - top="114" - width="85"> - Preview : - </text> - <button - height="20" - label="Play" - label_selected="Play" - layout="topleft" - left="480" - name="WLAnimSky" - top_pad="5" - width="83" /> - <button - height="20" - label="Stop!" - label_selected="Stop" - layout="topleft" - left_pad="4" - name="WLStopAnimSky" - top_delta="0" - width="83" /> - <button - height="20" - label="Use Estate Time" - label_selected="Go to Estate Time" - layout="topleft" - left="480" - name="WLUseLindenTime" - top_pad="9" - width="170" /> - <button - height="20" - label="Save Test Day" - label_selected="Save Test Day" - layout="topleft" - left_delta="0" - name="WLSaveDayCycle" - top_pad="9" - width="170" /> - <button - height="20" - label="Load Test Day" - label_selected="Load Test Day" - layout="topleft" - left_delta="0" - name="WLLoadDayCycle" - top_pad="3" - width="170" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml new file mode 100644 index 0000000000..b5de4166f6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<floater + legacy_header_height="18" + height="130" + help_topic="" + layout="topleft" + name="Delete Env Preset" + save_rect="true" + title="DELETE ENV PRESET" + width="550"> + + <string name="title_water">Delete Water Preset</string> + <string name="title_sky">Delete Sky Preset</string> + <string name="title_day_cycle">Delete Day Cycle</string> + + <string name="label_water">Preset:</string> + <string name="label_sky">Preset:</string> + <string name="label_day_cycle">Day cycle:</string> + + <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string> + <string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string> + + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="50" + name="label" + top="60" + width="60"> + Preset: + </text> + <combo_box + follows="top|left" + layout="topleft" + left_pad="10" + name="preset_combo" + top_delta="-5" + width="200"/> + <button + follows="bottom|right" + height="23" + label="Delete" + layout="topleft" + left_pad="15" + name="delete" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="5" + name="cancel" + width="70"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..d9a3ad0c4b --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -0,0 +1,485 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="381" + layout="topleft" + name="Edit Day cycle" + help_topic="day_presets" + save_rect="true" + title="Edit Day Cycle" + width="705"> + + <string name="title_new">Create a New Day Cycle</string> + <string name="title_edit">Edit Day Cycle</string> + <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string> + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + height="10" + layout="topleft" + left="10" + name="hint" + top="25" + width="685" /> + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="10" + name="label" + top_pad="25" + width="120"> + Preset Name: + </text> + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + max_chars="100" + name="day_cycle_combo" + top_delta="-5" + width="200" /> + <line_editor + height="20" + left_delta="0" + name="day_cycle_name" + top_delta="0" + visible="true" + width="200" /> + <text + follows="top|left|right" + height="95" + layout="topleft" + left_pad="10" + name="note" + top_delta="0" + width="345" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + <!--======== Controls panel ========--> + <text + follows="left|top|right" + height="10" + layout="topleft" + left="10" + name="hint_item1" + top="100" + width="300"> + - Click on a tab to edit the specific sky settings and time. + </text> + <text + follows="left|top|right" + height="10" + layout="topleft" + name="hint_item2" + top_pad="10" + width="300"> + - Click and drag the tabs to set the transition times. + </text> + <text + follows="left|top|right" + height="10" + layout="topleft" + name="hint_item3" + top_pad="10" + width="300"> + - Use the scrubber to preview your day cycle. + </text> + <panel + follows="top|left" + height="100" + name="day_cycle_slider_panel" + layout="topleft" + left_delta="25" + top_pad="15" + width="660"> + <multi_slider + can_edit_text="true" + control_name="WLTimeSlider" + decimal_digits="0" + draw_track="false" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left="20" + max_sliders="20" + max_val="24" + name="WLTimeSlider" + show_text="false" + top_pad="0" + use_triangle="true" + width="525" /> + <multi_slider + can_edit_text="true" + control_name="WLDayCycleKeys" + decimal_digits="0" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left_delta="0" + max_sliders="20" + max_val="24" + name="WLDayCycleKeys" + show_text="false" + top_pad="15" + width="525" /> + <button + height="20" + label="Add Key" + label_selected="Add Key" + layout="topleft" + left_pad="20" + name="WLAddKey" + top_delta="-18" + width="96" /> + <button + height="20" + label="Delete Key" + label_selected="Delete Key" + layout="topleft" + name="WLDeleteKey" + top_pad="5" + width="96" /> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left="8" + name="WL12am" + top="74" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL3am" + top_delta="0" + width="55"> + 3am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL6am" + top_delta="0" + width="55"> + 6am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL9amHash" + top_delta="0" + width="55"> + 9am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL12pmHash" + top_delta="0" + width="55"> + 12pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL3pm" + top_delta="0" + width="55"> + 3pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL6pm" + top_delta="0" + width="55"> + 6pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL9pm" + top_delta="0" + width="55"> + 9pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL12am2" + top_delta="0" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left="20" + name="WL12amHash" + top="54" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL3amHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL6amHash" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL9amHash2" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL12pmHash2" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL3pmHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL6pmHash" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL9pmHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL12amHash2" + top_delta="-3" + width="6"> + | + </text> + </panel> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="192" + name="WLCurKeyPresetText" + top_pad="10" + width="80"> + Sky Setting: + </text> + <combo_box + height="18" + label="Preset" + layout="topleft" + left_pad="5" + name="WLSkyPresets" + width="205" /> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-40" + name="WLCurKeyTimeText" + top_pad="15" + width="35"> + Time: + </text> + <time + follows="left|top" + height="16" + label_width="0" + layout="topleft" + left_pad="3" + name="time" + top_delta="-1" + value="6:00 AM" + width="75"/> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="10" + name="horiz_separator" + top_pad="20" + width="685"/> + <loading_indicator + height="23" + layout="topleft" + left="25" + name="progress_indicator" + top="350" + visible="false" + width="23" /> + <check_box + follows="top|left" + height="10" + label="Make this my new day cycle" + layout="topleft" + left="310" + name="make_default_cb" + top_delta="13" + width="230"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + top_delta="-13" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + top_delta="0" + width="70"/> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..56233d91ee --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml @@ -0,0 +1,953 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="375" + layout="topleft" + name="Edit Sky Preset" + help_topic="sky_preset" + save_rect="true" + title="Edit Sky Preset" + width="840"> + + <string name="title_new">Create a New Sky Preset</string> + <string name="title_edit">Edit Sky Preset</string> + <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string> + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + height="10" + layout="topleft" + left="30" + name="hint" + top="25" + width="700"> + To edit your preset, adjust the controls then click "Save" + </text> + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="30" + name="label" + top_pad="25" + width="120"> + Preset Name: + </text> + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + max_chars="100" + name="sky_preset_combo" + top_delta="-5" + width="200"/> + <line_editor + height="20" + left_delta="0" + name="sky_preset_name" + top_delta="0" + width="200" /> + <text + follows="top|left|right" + height="40" + layout="topleft" + left_pad="10" + name="note" + top_delta="0" + width="405" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + <!--======== Controls panel ========--> + <view_border + bevel_style="none" + follows="top|left" + height="203" + layout="topleft" + left="25" + name="panel_water_preset" + top="122" + visible="true" + width="790"/> + <tab_container + follows="left|top" + height="225" + halign="center" + layout="topleft" + left="22" + name="WindLight Tabs" + tab_position="top" + top="101" + width="794"> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="ATMOSPHERE" + layout="topleft" + left="1" + help_topic="sky_preset_atmosphere" + mouse_opaque="false" + name="Atmosphere" + top="60" + width="698"> + + <!--======== Tab Panel I. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="40" + name="BHText" + top="25" + width="200"> + Blue Horizon + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="WLBlueHorizon" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + top_pad="20" + name="BDensText" + width="200"> + Haze Horizon + </text> + <slider + control_name="WLHazeHorizon" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.25" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLHazeHorizon" + width="200" /> + + <!--======== Tab Panel I. II conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="BDensText2" + top="25" + width="200"> + Blue Density + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="WLBlueDensity" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="HDText" + top_pad="20" + width="200"> + Haze Density + </text> + <slider + control_name="WLHazeDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="0" + max_val="4" + name="WLHazeDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel I. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="DensMultText" + top="25" + width="200"> + Density Multiplier + </text> + <slider + control_name="WLDensityMult" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.1" + layout="topleft" + left_delta="15" + max_val="0.9" + name="WLDensityMult" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLDistanceMultText" + top_pad="20" + width="200"> + Distance Multiplier + </text> + <slider + control_name="WLDistancMult" + decimal_digits="1" + follows="left|top" + height="10" + initial_value="1.0" + layout="topleft" + left_delta="15" + max_val="100" + name="WLDistanceMult" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="MaxAltText" + top_pad="20" + width="200"> + Max Altitude + </text> + <slider + control_name="WLMaxAltitude" + decimal_digits="0" + follows="left|top" + height="10" + increment="1" + initial_value="500" + layout="topleft" + left_delta="15" + max_val="4000" + name="WLMaxAltitude" + top_pad="6" + width="200" /> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="LIGHTING" + layout="topleft" + left_delta="0" + help_topic="sky_preset_lighting" + name="Lighting" + top_delta="4" + width="698"> + + <!--======== Tab Panel II. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="20" + name="SLCText" + top="25" + width="150"> + Sun/Moon Color + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="10" + name="WLSunlight" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-10" + name="WLAmbientText" + top_pad="20" + width="150"> + Ambient + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="10" + name="WLAmbient" + top_pad="6" + width="60" /> + + <!--======== Tab Panel II. II conlumn of controls ========--> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="100" + name="SunGlowText" + top="25" + width="200"> + Sun Glow + </text> + <slider + control_name="WLGlowB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.1" + label="Focus " + layout="topleft" + left_delta="10" + max_val="0.5" + name="WLGlowB" + top_pad="6" + width="200" /> + <slider + control_name="WLGlowR" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="0.25" + label="Size " + layout="topleft" + left_delta="0" + max_val="1.99" + min_val="1" + name="WLGlowR" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-10" + name="WLStarText" + top_pad="20" + width="200"> + Star Brightness + </text> + <slider + control_name="WLStarAlpha" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="10" + max_val="2" + name="WLStarAlpha" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-10" + name="SceneGammaText" + top_pad="20" + width="200"> + Scene Gamma + </text> + <slider + control_name="WLGamma" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="2.0" + layout="topleft" + left_delta="10" + max_val="10" + name="WLGamma" + top_pad="6" + width="200" /> + + <!--======== Tab Panel II. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="60" + name="TODText" + top="25" + width="200"> + Sun/Moon Position + </text> + <multi_slider + can_edit_text="true" + control_name="WLSunPos" + decimal_digits="0" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left_delta="0" + max_sliders="1" + max_val="24" + name="WLSunPos" + show_text="false" + top_pad="0" + width="300" /> + + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_delta="2" + name="WL12amHash" + top_pad="6" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="66" + name="WL6amHash" + top_delta="0" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="67" + name="WL12pmHash2" + top_delta="0" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="67" + name="WL6pmHash" + top_delta="0" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="67" + name="WL12amHash2" + top_delta="0" + width="6"> + | + </text> + + + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_delta="-300" + name="WL12am" + top="74" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="20" + name="WL6am" + top_delta="0" + width="55"> + 6am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="15" + name="WL12pmHash" + top_delta="0" + width="55"> + 12pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="18" + name="WL6pm" + top_delta="0" + width="55"> + 6pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="15" + name="WL12am2" + top_delta="0" + width="55"> + 12am + </text> + + <time + follows="left|top" + height="16" + label_width="0" + layout="topleft" + left_delta="-175" + name="WLDayTime" + top_pad="15" + value="6:00 AM" + width="75"/> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-106" + name="WLEastAngleText" + top_pad="24" + width="200"> + East Angle + </text> + <slider + control_name="WLEastAngle" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.0" + layout="topleft" + left_delta="10" + name="WLEastAngle" + top_pad="6" + width="200" /> + + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="CLOUDS" + layout="topleft" + left_delta="0" + mouse_opaque="false" + help_topic="sky_preset_clouds" + name="Clouds" + top_delta="4" + width="698"> + + <!--======== Tab Panel III. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="40" + name="WLCloudColorText" + top="25" + width="200"> + Cloud Color + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="WLCloudColor" + top_pad="6" + width="60" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="WLCloudColorText2" + top_pad="20" + width="200"> + Cloud XY/Density + </text> + <slider + control_name="WLCloudX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="X" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudX" + width="200" /> + <slider + control_name="WLCloudY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="Y" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudY" + width="200" /> + <slider + control_name="WLCloudDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="D" + layout="topleft" + left_delta="0" + name="WLCloudDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel III. II conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="WLCloudCoverageText" + top="15" + width="200"> + Cloud Coverage + </text> + <slider + control_name="WLCloudCoverage" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="15" + name="WLCloudCoverage" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLCloudScaleText" + top_pad="20" + width="200"> + Cloud Scale + </text> + <slider + control_name="WLCloudScale" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + layout="topleft" + left_delta="15" + min_val="0.01" + name="WLCloudScale" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-13" + name="WLCloudDetailText" + top_pad="20" + width="200"> + Cloud Detail (XY/Density) + </text> + <slider + control_name="WLCloudDetailX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="X" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudDetailX" + width="200" /> + <slider + control_name="WLCloudDetailY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="Y" + layout="topleft" + left_delta="0" + name="WLCloudDetailY" + top_pad="6" + width="200" /> + <slider + control_name="WLCloudDetailDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="D" + layout="topleft" + left_delta="0" + name="WLCloudDetailDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel III. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="WLCloudScrollXText" + top="15" + width="150"> + Cloud Scroll X + </text> + <check_box + control_name="WLCloudLockX" + follows="left|top" + height="16" + label="Lock" + layout="topleft" + left_delta="150" + name="WLCloudLockX" + top_delta="0" + width="200" /> + <slider + control_name="WLCloudScrollX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="-135" + max_val="10" + min_val="-10" + name="WLCloudScrollX" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLCloudScrollYText" + top_pad="20" + width="150"> + Cloud Scroll Y + </text> + <check_box + control_name="WLCloudLockY" + follows="left|top" + height="16" + label="Lock" + layout="topleft" + left_delta="150" + name="WLCloudLockY" + width="200" /> + <slider + control_name="WLCloudScrollY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="-135" + max_val="10" + min_val="-10" + name="WLCloudScrollY" + top_pad="6" + width="200" /> + </panel> + </tab_container> +<!--======== End of Controls panel ========--> + + <check_box + follows="top|left" + height="10" + label="Make this preset my new sky setting" + layout="topleft" + left="380" + name="make_default_cb" + top_pad="30" + width="280"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml new file mode 100644 index 0000000000..905983e7fa --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml @@ -0,0 +1,448 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="375" + layout="topleft" + name="Edit Water Preset" + help_topic="water_preset" + save_rect="true" + title="Edit Water Preset" + width="725"> + + <string name="title_new">Create a New Water Preset</string> + <string name="title_edit">Edit a Water Preset</string> + <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string> + <string name="combo_label">-Select a preset-</string> + + <text + follows="top|left|right" + height="10" + layout="topleft" + left="30" + name="hint" + top="25" + width="680"> + To edit your preset, adjust the controls then click "Save" + </text> + + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="30" + name="label" + top_pad="25" + width="120"> + Preset Name: + </text> + + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + max_chars="100" + name="water_preset_combo" + top_delta="-5" + width="200"/> + + <line_editor + height="20" + left_delta="0" + name="water_preset_name" + top_delta="0" + width="200" /> + + <text + follows="top|left|right" + height="40" + layout="topleft" + left_pad="10" + name="note" + top_delta="0" + width="340" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + + <!--======== Controls panel ========--> + <panel + border="false" + bevel_style="none" + follows="top|left" + height="230" + layout="topleft" + left="10" + name="panel_water_preset" + top="100" + width="700"> + +<!--======== I conlumn of controls ========--> + <text + follows="left|top|right" + height="10" + font="SansSerif" + layout="topleft" + left="10" + name="water_color_label" + top="5" + width="215"> + Water Fog Color + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="15" + name="WaterFogColor" + top_pad="8" + width="60" /> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + top_pad="10" + name="water_fog_density_label" + width="215"> + Fog Density Exponent + </text> + <slider + decimal_digits="1" + follows="left|top" + height="10" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="10" + name="WaterFogDensity" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + top_pad="15" + name="underwater_fog_modifier_label" + width="215"> + Underwater Fog Modifier + </text> + <slider + decimal_digits="1" + follows="left|top" + height="10" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="10" + name="WaterUnderWaterFogMod" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="BHText" + top_pad="15" + width="215"> + Big Wave Direction + </text> + <slider + control_name="WaterWave1DirX" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="X" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave1DirX" + top_pad="10" + width="216"/> + <slider + control_name="WaterWave1DirY" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="Y" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave1DirY" + top_pad="5" + width="216"/> + +<!--======== II conlumn of controls ========--> + + <text + follows="left|top|right" + font="SansSerif" + height="10" + layout="topleft" + left_pad="20" + name="BDensText" + top="5" + width="215"> + Reflection Wavelet Scale + </text> + <slider + control_name="WaterNormalScaleX" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + left_delta="15" + max_val="10" + name="WaterNormalScaleX" + top_pad="10" + width="200"/> + <slider + control_name="WaterNormalScaleY" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + max_val="10" + name="WaterNormalScaleY" + top_pad="6" + width="200"/> + <slider + control_name="WaterNormalScaleZ" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + max_val="10" + name="WaterNormalScaleZ" + top_pad="6" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="HDText" + top_pad="16" + width="215"> + Fresnel Scale + </text> + <slider + control_name="WaterFresnelScale" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="15" + name="WaterFresnelScale" + top_pad="10" + width="200"/> + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="FresnelOffsetText" + top_pad="15" + width="215"> + Fresnel Offset + </text> + <slider + control_name="WaterFresnelOffset" + decimal_digits="2" + follows="left" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="15" + name="WaterFresnelOffset" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="BHText2" + top_pad="15" + width="215"> + Little Wave Direction + </text> + <slider + control_name="WaterWave2DirX" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="X" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave2DirX" + top_pad="10" + width="216" /> + <slider + control_name="WaterWave2DirY" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="Y" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave2DirY" + top_pad="6" + width="216" /> + +<!--======== III conlumn of contorls ========--> + + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_pad="20" + name="DensMultText" + top="5" + width="215"> + Refract Scale Above + </text> + <slider + control_name="WaterScaleAbove" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.1" + layout="topleft" + left_delta="15" + name="WaterScaleAbove" + top_pad="5" + width="200" /> + + <text + type="string" + length="1" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WaterScaleBelowText" + top_pad="15" + width="215"> + Refract Scale Below + </text> + <slider + control_name="WaterScaleBelow" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="15" + name="WaterScaleBelow" + top_pad="5" + width="200"/> + + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="MaxAltText" + top_pad="15" + width="215"> + Blur Multiplier + </text> + <slider + control_name="WaterBlurMult" + follows="left|top" + height="10" + increment="0.001" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="0.16" + name="WaterBlurMult" + top_pad="5" + width="200"/> + + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="BHText3" + top_pad="15" + width="215"> + Normal Map + </text> + <texture_picker + height="80" + layout="topleft" + left_delta="15" + name="WaterNormalMap" + top_pad="5" + width="100" /> + </panel> +<!--======== End of Controls panel ========--> + + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="10" + name="horiz_separator" + top_pad="5" + width="700"/> + <check_box + follows="top|left" + height="10" + label="Make this preset my new water setting" + layout="topleft" + left="275" + name="make_default_cb" + top_pad="20" + width="280"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml deleted file mode 100644 index 8df5e232d9..0000000000 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ /dev/null @@ -1,164 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="150" - layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" - save_rect="true" - title="ENVIRONMENT EDITOR" - width="600"> - <floater.string - name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvTimeText" - top="32" - width="140"> - Time of Day - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="16" - layout="topleft" - left="15" - name="EnvTimeText2" - top="62" - width="140"> - 12:00 PM - </text> - <icon - height="25" - image_name="icon_diurnal.tga" - layout="topleft" - left="85" - name="EnvDayCycle" - top="30" - use_draw_context_alpha="false" - width="200" /> - <slider - control_name="EnvTimeSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.0069444" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="0.99" - name="EnvTimeSlider" - show_text="false" - top_pad="10" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvCloudText" - top="86" - width="140"> - Cloud Cover - </text> - <slider - control_name="EnvCloudSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="75" - name="EnvCloudSlider" - top_delta="4" - width="210" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterColorText" - top="39" - width="140"> - Water Color - </text> - <color_swatch - can_apply_immediately="true" - color="0.5 0.5 0.5 1" - follows="left|top" - height="50" - layout="topleft" - left="390" - name="EnvWaterColor" - tool_tip="Click to open color picker" - top="30" - width="40" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterFogText" - top="86" - width="140"> - Water Fog - </text> - <slider - control_name="EnvWaterFogSlider" - decimal_digits="2" - follows="left" - height="10" - initial_value="0" - layout="topleft" - left_delta="75" - max_val="10" - name="EnvWaterFogSlider" - top_delta="4" - width="210" /> - <button - follows="left|top" - height="23" - label="Use Estate Time" - layout="topleft" - left="10" - name="EnvUseEstateTimeButton" - top="120" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Sky" - layout="topleft" - left_pad="3" - name="EnvAdvancedSkyButton" - top_delta="0" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Water" - layout="topleft" - left_pad="3" - name="EnvAdvancedWaterButton" - top_delta="0" - width="137" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml new file mode 100644 index 0000000000..1b1cafaca6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="328" + layout="topleft" + name="Environment Editor Floater" + help_topic="environment_editor_floater" + save_rect="true" + title="ENVIRONMENT SETTINGS" + width="540"> + + <text + follows="top|left|right" + height="15" + layout="topleft" + left="20" + name="note" + top="25" + width="510" + wrap="true"> + Use the options below to customize the environment settings for your viewer. + </text> + + <view_border + bevel_style="none" + follows="top|left" + height="237" + layout="topleft" + left="20" + name="border" + top_pad="8" + width="500"/> + <radio_group + follows="top|left" + height="45" + layout="topleft" + left_delta="10" + name="region_settings_radio_group" + top_delta="20" + width="200"> + <radio_item + label="Use region settings" + layout="topleft" + name="use_region_settings"/> + <radio_item + label="Customize my environment" + layout="topleft" + name="use_my_settings" + top_pad="20"/> + </radio_group> + + <panel + height="170" + layout="topleft" + left="50" + name="user_environment_settings" + top_pad="0" + width="470"> + + <text + follows="top|left|right" + font="SansSerifItalic" + height="15" + layout="topleft" + left_delta="0" + name="note" + top_pad="0" + width="470" + wrap="true"> + Note: your custom settings will not be visible to other users. + </text> + + <!-- Water Setting --> + <text + name="water_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top="40" + width="200"> + Water Setting + </text> + <combo_box + follows="top|left" + left_pad="2" + name="water_settings_preset_combo" + top_delta="-5" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + + + <!-- Sky/Day Cycle Settings --> + <text + name="sky_dayc_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top_pad="20" + width="100"> + Sky / Day Cycle + </text> + <radio_group + layout="topleft" + left_delta="50" + name="sky_dayc_settings_radio_group" + top_pad="10" + height="50" + width="150"> + <radio_item + layout="topleft" + label="Fixed sky" + name="my_sky_settings"/> + <radio_item + layout="topleft" + label="Day cycle" + name="my_dayc_settings" + top_pad="25"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="sky_settings_preset_combo" + top_delta="-7" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + <combo_box + follows="top|left" + name="dayc_settings_preset_combo" + top_delta="36" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + </panel> + + <button + follows="left|top" + height="23" + label="OK" + layout="topleft" + right="-130" + name="ok_btn" + top_pad="10" + width="100" /> + <button + follows="left|top" + height="23" + label="Cancel" + layout="topleft" + left_pad="10" + name="cancel_btn" + width="100" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index 02e50ee584..de6d586f72 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -2,6 +2,8 @@ <floater legacy_header_height="18" can_resize="true" + left="10000" + bottom="10000" height="600" layout="topleft" min_height="150" diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 43729d7c9f..5a1f920398 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -5,7 +5,7 @@ height="440" layout="topleft" min_height="140" - min_width="467" + min_width="0" name="floater_about" help_topic="floater_about" save_rect="true" diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 7f15de7236..060ddec1f4 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -74,27 +74,85 @@ follows="all"/> <text - follows="top|left" font="SansSerif" + bottom_delta="15" left_delta="0" name="warning_title" text_color="Yellow" - top_pad="10" visible="false"> WARNING: </text> <text - follows="top|left" text_color="White" - height="50" + height="40" + width="290" + top_delta="15" left_delta="0" name="warning_message" parse_urls="true" - top_pad="5" wrap="true" visible="false"> - You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get certifed for mesh model uploads. - </text> + You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.</text> + + <text + height="65" + top_delta="45" + left_delta="0" + name="weights_text" + width="80" + word_wrap="true" + > +Streaming: +Physics: +Simulation: + +Prim equivs: + </text> + + <text + height="65" + top_delta="0" + left_delta="80" + name="weights" + width="70" + word_wrap="true" + > +[ST] +[PH] +[SIM] + +[EQ] + </text> + + <text + height="65" + top_delta="0" + left_delta="70" + name="price_breakdown_text" + width="80" + word_wrap="true" + > +Streaming: +Physics: +Instances: +Textures: +Model: + </text> + + <text + height="65" + top_delta="0" + left_delta="80" + name="price_breakdown" + width="65" + word_wrap="true" + > +L$ [STREAMING] +L$ [PHYSICS] +L$ [INSTANCES] +L$ [TEXTURES] +L$ [MODEL] + </text> <tab_container follows="right|top|bottom" @@ -407,12 +465,14 @@ <text height="16" - left="310" - name="weights" + left_delta="5" + bottom_delta="30" + name="upload_fee" width="300" + follows="bottom|right" word_wrap="true" - top_pad="7"> - Prim equivs: [EQ] Physics: [PH] Upload fee: [FEE] L$ + > + Upload fee: L$ [FEE] </text> <button bottom="540" left="10" follows="bottom|left" height="20" label="Set to defaults" diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 32fb6f97e7..3b58cd08f6 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -16,5 +16,5 @@ name="region_panels" right="-1" tab_position="top" - top="20" /> + top="20"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml deleted file mode 100644 index 3a44ba3763..0000000000 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ /dev/null @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="240" - layout="topleft" - name="Water Floater" - help_topic="water_floater" - save_rect="true" - title="ADVANCED WATER EDITOR" - width="700"> - <floater.string - name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - height="16" - layout="topleft" - left="10" - name="KeyFramePresetsText" - top="34" - font="SansSerif" - width="85"> - Water Presets: - </text> - <combo_box - height="23" - layout="topleft" - left_delta="95" - name="WaterPresetsCombo" - top_delta="-4" - width="150" /> - <button - height="23" - label="New" - label_selected="New" - layout="topleft" - left_pad="3" - name="WaterNewPreset" - top_delta="0" - width="70" /> - <button - height="23" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="3" - name="WaterSavePreset" - top_delta="0" - width="70" /> - <button - height="23" - label="Delete" - label_selected="Delete" - layout="topleft" - left_pad="3" - name="WaterDeletePreset" - top_delta="0" - width="70" /> - <tab_container - border="false" - follows="left|top" - height="180" - halign="center" - layout="topleft" - left="0" - name="Water Tabs" - tab_position="top" - top="60" - width="700"> - <panel - border="true" - follows="all" - height="180" - label="SETTINGS" - layout="topleft" - left="0" - mouse_opaque="false" - help_topic="water_settings_tab" - name="Settings" - top="0" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="200"> - Water Fog Color - </text> - <color_swatch - can_apply_immediately="true" - color="0.5 0.5 0.5 1" - follows="left|top" - height="50" - layout="topleft" - left="40" - name="WaterFogColor" - tool_tip="Click to open color picker" - top="30" - width="40" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="WaterFogDensText" - top="84" - width="200"> - Fog Density Exponent - </text> - <slider - control_name="WaterFogDensity" - decimal_digits="1" - follows="left" - height="10" - initial_value="16" - layout="topleft" - left="24" - max_val="10" - name="WaterFogDensity" - top="124" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WaterUnderWaterFogModText" - top="124" - width="200"> - Underwater Fog Modifier - </text> - <slider - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="16" - layout="topleft" - left="24" - max_val="2" - name="WaterUnderWaterFogMod" - top="164" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="BDensText" - top="4" - width="200"> - Reflection Wavelet Scale - </text> - <slider - control_name="WaterNormalScaleX" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="1" - layout="topleft" - max_val="10" - name="WaterNormalScaleX" - top_pad="24" - width="200" /> - <slider - control_name="WaterNormalScaleY" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="2" - layout="topleft" - max_val="10" - name="WaterNormalScaleY" - top_pad="4" - width="200" /> - <slider - control_name="WaterNormalScaleZ" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="3" - layout="topleft" - max_val="10" - name="WaterNormalScaleZ" - top_pad="4" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - name="HDText" - top="84" - width="200"> - Fresnel Scale - </text> - <slider - control_name="WaterFresnelScale" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WaterFresnelScale" - top="124" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - name="FresnelOffsetText" - top="124" - width="200"> - Fresnel Offset - </text> - <slider - control_name="WaterFresnelOffset" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WaterFresnelOffset" - top="164" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="DensMultText" - top="4" - width="200"> - Refract Scale Above - </text> - <slider - control_name="WaterScaleAbove" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left="494" - name="WaterScaleAbove" - top="44" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WaterScaleBelowText" - top="44" - width="200"> - Refract Scale Below - </text> - <slider - control_name="WaterScaleBelow" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left="494" - name="WaterScaleBelow" - top="84" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="MaxAltText" - top="84" - width="200"> - Blur Multiplier - </text> - <slider - control_name="WaterBlurMult" - follows="left" - height="10" - increment="0.001" - initial_value="0" - layout="topleft" - left="494" - max_val="0.16" - name="WaterBlurMult" - top="124" - width="200" /> - </panel> - <panel - border="true" - follows="all" - height="180" - label="IMAGE" - layout="topleft" - left="0" - mouse_opaque="false" - help_topic="water_waves_tab" - name="Waves" - top="0" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="200"> - Big Wave Direction - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - name="WaterWave1DirXText" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WaterWave1DirX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - max_val="4" - min_val="-4" - name="WaterWave1DirX" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="WaterWave1DirYText" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WaterWave1DirY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="4" - min_val="-4" - name="WaterWave1DirY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-10" - width="355"> - Little Wave Direction - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - left_delta="0" - name="WaterWave2DirXText" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WaterWave2DirX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - max_val="4" - min_val="-4" - name="WaterWave2DirX" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="WaterWave2DirYText" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WaterWave2DirY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="4" - min_val="-4" - name="WaterWave2DirY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="240" - name="BHText3" - top="4" - width="200"> - Normal Map - </text> - <texture_picker - height="143" - layout="topleft" - left="250" - name="WaterNormalMap" - top="22" - width="128" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index e04a72cbc0..69e6057556 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -18,6 +18,7 @@ follows="left|right|top|bottom" layout="topleft" left="5" + animate="false" name="stack1" orientation="vertical" top="20" @@ -156,14 +157,20 @@ name="external_controls" top_delta="0" user_resize="false" + auto_resize="true" width="585"> <web_browser - bottom="-22" + bottom="-2" follows="all" layout="topleft" left="0" name="webbrowser" top="0"/> + </layout_panel> + <layout_panel name="status_bar" + height="23" + auto_resize="false" + user_resize="false"> <text type="string" length="200" @@ -174,7 +181,7 @@ name="statusbartext" parse_urls="false" text_color="0.4 0.4 0.4 1" - top_pad="5" + top_pad="3" width="495"/> <progress_bar color_bar="0.3 1.0 0.3 1" diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml deleted file mode 100644 index 7923dd87fa..0000000000 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ /dev/null @@ -1,1288 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="256" - layout="topleft" - name="WindLight floater" - help_topic="windlight_floater" - save_rect="true" - title="ADVANCED SKY EDITOR" - width="700"> - <floater.string - name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="KeyFramePresetsText" - top="34" - width="135"> - Sky Presets: - </text> - <combo_box - height="23" - layout="topleft" - left_delta="135" - name="WLPresetsCombo" - top_delta="-4" - width="150" /> - <button - height="23" - label="New" - label_selected="New" - layout="topleft" - left_pad="3" - name="WLNewPreset" - width="70" /> - <button - height="23" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="3" - name="WLSavePreset" - width="70" /> - <button - height="23" - label="Delete" - label_selected="Delete" - layout="topleft" - left_pad="3" - name="WLDeletePreset" - width="70" /> - <button - height="23" - label="Day Cycle Editor" - label_selected="Day Cycle Editor" - layout="topleft" - right="-10" - name="WLDayCycleMenuButton" - top_pad="-23" - width="120" /> - <tab_container - follows="left|top" - height="196" - halign="center" - layout="topleft" - left="0" - name="WindLight Tabs" - tab_position="top" - top="60" - width="700"> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="ATMOSPHERE" - layout="topleft" - left="1" - mouse_opaque="false" - help_topic="windlight_atmosphere_tab" - name="Atmosphere" - top="60" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="355"> - Blue Horizon - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - name="BHText2" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueHorizonR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueHorizonR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - top_pad="-15" - name="BHText3" - width="10"> - G - </text> - <slider - control_name="WLBlueHorizonG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText4" - left="10" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueHorizonB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WLBlueHorizonB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText5" - left="10" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueHorizonI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - name="WLBlueHorizonI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - top_pad="-10" - name="BDensText" - width="355"> - Haze Horizon - </text> - <slider - control_name="WLHazeHorizon" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - layout="topleft" - left="23" - top_delta="0" - top_pad="27" - name="WLHazeHorizon" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="BDensText2" - top="4" - width="355"> - Blue Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText6" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueDensityR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueDensityR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText7" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLBlueDensityG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText8" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueDensityB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText9" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueDensityI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLBlueDensityI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="HDText" - top_pad="-10" - width="355"> - Haze Density - </text> - <slider - control_name="WLHazeDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="258" - max_val="4" - name="WLHazeDensity" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="DensMultText" - top="4" - width="355"> - Density Multiplier - </text> - <slider - control_name="WLDensityMult" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left_delta="13" - max_val="0.9" - name="WLDensityMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLDistanceMultText" - top_pad="-10" - width="355"> - Distance Multiplier - </text> - <slider - control_name="WLDistancMult" - decimal_digits="1" - follows="left" - height="10" - initial_value="1.0" - layout="topleft" - left_delta="13" - max_val="100" - name="WLDistanceMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="MaxAltText" - top_pad="-15" - width="355"> - Max Altitude - </text> - <slider - control_name="WLMaxAltitude" - decimal_digits="0" - follows="left" - height="10" - increment="1" - initial_value="500" - layout="topleft" - left_delta="13" - max_val="4000" - name="WLMaxAltitude" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="LIGHTING" - layout="topleft" - left_delta="0" - help_topic="windlight_lighting_tab" - name="Lighting" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="SLCText" - top="4" - width="355"> - Sun/Moon Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLSunlightR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLSunlightR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLSunlightG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLSunlightB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLSunlightI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLSunlightI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="TODText" - top_pad="-10" - width="355"> - Sun/Moon Position - </text> - <icon - height="20" - image_name="icon_diurnal.tga" - layout="topleft" - left_delta="14" - top_pad="10" - name="SkyDayCycle" - use_draw_context_alpha="false" - width="148" /> - <slider - control_name="WLSunAngle" - follows="left" - height="10" - increment="0.001" - initial_value="0.7" - layout="topleft" - left_delta="-8" - name="WLSunAngle" - top_pad="20" - width="207" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLAmbientText" - top="4" - width="355"> - Ambient - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLAmbientR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLAmbientR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLAmbientG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLAmbientB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText8" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLAmbientI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLAmbientI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLEastAngleText" - top_pad="-10" - width="355"> - East Angle - </text> - <slider - control_name="WLEastAngle" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.0" - layout="topleft" - left_delta="13" - name="WLEastAngle" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="SunGlowText" - top="4" - width="355"> - Sun Glow - </text> - <slider - control_name="WLGlowB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - label="Focus " - layout="topleft" - left_delta="0" - max_val="0.5" - name="WLGlowB" - top_pad="27" - width="200" /> - <slider - control_name="WLGlowR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - label="Size " - layout="topleft" - left_delta="0" - max_val="1.99" - min_val="1" - name="WLGlowR" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="SceneGammaText" - top_pad="-10" - width="200"> - Scene Gamma - </text> - <slider - control_name="WLGamma" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="2.0" - layout="topleft" - left_delta="0" - max_val="10" - name="WLGamma" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="WLStarText" - top_pad="-10" - width="355"> - Star Brightness - </text> - <slider - control_name="WLStarAlpha" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="0" - max_val="2" - name="WLStarAlpha" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="CLOUDS" - layout="topleft" - left_delta="0" - mouse_opaque="false" - help_topic="windlight_clouds_tab" - name="Clouds" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="WLCloudColorText" - top="4" - width="355"> - Cloud Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLCloudColorR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudColorR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLCloudColorG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLCloudColorB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLCloudColorI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudColorI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudColorText2" - top_pad="-10" - width="355"> - Cloud XY/Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudY" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLCloudCoverageText" - top="4" - width="355"> - Cloud Coverage - </text> - <slider - control_name="WLCloudCoverage" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="13" - name="WLCloudCoverage" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudScaleText" - top_pad="-10" - width="355"> - Cloud Scale - </text> - <slider - control_name="WLCloudScale" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="13" - min_val="0.01" - name="WLCloudScale" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudDetailText" - top_pad="-10" - width="355"> - Cloud Detail (XY/Density) - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_pad="8" - width="10"> - X - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="8" - name="WLCloudDetailX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText9" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudDetailY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="0" - name="WLCloudDetailY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText10" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDetailDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDetailDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="WLCloudScrollXText" - top="4" - width="355"> - Cloud Scroll X - </text> - <check_box - control_name="WLCloudLockX" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockX" - width="200" /> - <slider - control_name="WLCloudScrollX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollX" - top="45" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WLCloudScrollYText" - top_delta="-1" - width="355"> - Cloud Scroll Y - </text> - <check_box - control_name="WLCloudLockY" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockY" - width="200" /> - <slider - control_name="WLCloudScrollY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollY" - top="85" - width="200" /> - <check_box - control_name="DrawClassicClouds" - follows="left" - height="16" - label="Draw Classic Clouds" - layout="topleft" - left="480" - name="DrawClassicClouds" - top="104" - width="200" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index 3af056baa9..0f42000ae7 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -42,7 +42,7 @@ <menu_item_call.on_enable function="File.EnableUpload" /> </menu_item_call> - <menu_item_call + <menu_item_call label="Model..." layout="topleft" name="Upload Model"> @@ -251,4 +251,4 @@ parameter="eyes" /> </menu_item_call> </menu> -</menu> +</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index a0d0c8625e..499cf47b6c 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -480,7 +480,7 @@ <menu_item_separator/> - <menu + <menu create_jump_keys="true" label="Sun" name="Environment Settings" @@ -515,24 +515,105 @@ function="World.EnvSettings" parameter="midnight" /> </menu_item_call> - <menu_item_call - label="Estate Time" - name="Revert to Region Default"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="default" /> - </menu_item_call> - - <menu_item_separator/> - - <menu_item_call - label="Environment Editor" - name="Environment Editor"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="editor" /> - </menu_item_call> </menu> + + + <menu + create_jump_keys="true" + label="Enviroment Editor" + name="Enviroment Editor" + tear_off="true"> + + <menu_item_call + label="Enviroment Settings..." + name="Enviroment Settings"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="editor"/> + </menu_item_call> + + <menu_item_separator/> + + <menu + name="Water Presets" + label="Water Presets"> + <menu_item_call + label="New preset..." + name="new_water_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="new_water"/> + </menu_item_call> + <menu_item_call + label="Edit preset..." + name="edit_water_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="edit_water"/> + </menu_item_call> + <menu_item_call + label="Delete preset..." + name="delete_water_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="delete_water"/> + </menu_item_call> + </menu> + + <menu + name="Sky Presets" + label="Sky Presets"> + <menu_item_call + label="New preset..." + name="new_sky_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="new_sky"/> + </menu_item_call> + <menu_item_call + label="Edit preset..." + name="edit_sky_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="edit_sky"/> + </menu_item_call> + <menu_item_call + label="Delete preset..." + name="delete_sky_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="delete_sky"/> + </menu_item_call> + </menu> + + <menu + name="Day Presets" + label="Day Presets"> + <menu_item_call + label="New preset..." + name="new_day_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="new_day_cycle"/> + </menu_item_call> + <menu_item_call + label="Edit preset..." + name="edit_day_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="edit_day_cycle"/> + </menu_item_call> + <menu_item_call + label="Delete preset..." + name="delete_day_preset"> + <menu_item_call.on_click + function="World.EnvPreset" + parameter="delete_day_cycle"/> + </menu_item_call> + </menu> + </menu> + + </menu> <menu create_jump_keys="true" @@ -993,19 +1074,7 @@ <menu_item_call.on_visible function="File.VisibleUploadModel"/> </menu_item_call> - <menu_item_call - label="Model Wizard..." - layout="topleft" - name="Upload Model Wizard"> - <menu_item_call.on_click - function="Floater.Show" - parameter="upload_model_wizard" /> - <menu_item_call.on_enable - function="File.EnableUploadModel" /> - <menu_item_call.on_visible - function="File.VisibleUploadModel"/> - </menu_item_call> - <menu_item_call + <menu_item_call label="Bulk (L$[COST] per file)..." layout="topleft" name="Bulk Upload"> @@ -2009,10 +2078,7 @@ label="Show Upload Cost" layout="topleft" name="Show Upload Cost"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowUploadCost" /> - <menu_item_check.on_click + <menu_item_check.on_click function="ToggleControl" parameter="DebugShowUploadCost" /> </menu_item_check> @@ -2850,6 +2916,18 @@ function="Floater.Toggle" parameter="region_debug_console" /> </menu_item_check> + <menu_item_check + label="Region Debug Console" + name="Region Debug Console" + shortcut="control|shift|`" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="region_debug_console" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="region_debug_console" /> + </menu_item_check> <menu_item_separator /> <menu_item_check diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 97d84a16c6..6e2596a49e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4854,18 +4854,6 @@ Do you wish to overwrite the saved preset? <notification icon="alertmodal.tga" - name="WLDeletePresetAlert" - type="alertmodal"> -Do you wish to delete [SKY]? - <tag>confirm</tag> - <usetemplate - name="okcancelbuttons" - notext="No" - yestext="Yes"/> - </notification> - - <notification - icon="alertmodal.tga" name="WLNoEditDefault" type="alertmodal"> You cannot edit or delete a default preset. @@ -4882,81 +4870,53 @@ This day cycle file references a missing sky file: [SKY]. <notification icon="alertmodal.tga" - name="PPSaveEffectAlert" + name="WLRegionApplyFail" type="alertmodal"> -PostProcess Effect exists. Do you still wish overwrite it? - <usetemplate - name="okcancelbuttons" - notext="No" - yestext="Yes"/> - </notification> - - <notification - icon="alert.tga" - name="NewSkyPreset" - type="alert"> -Give me a name for the new sky. - <tag>confirm</tag> - <form name="form"> - <input name="message" type="text"> -New Preset - </input> - <button - default="true" - index="0" - name="OK" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> +Sorry, the settings couldn't be applied to the region. Leaving the region and then returning may help rectify the problem. The reason given was: [FAIL_REASON] </notification> <notification + functor="GenericAcknowledge" icon="alertmodal.tga" - name="ExistsSkyPresetAlert" + name="EnvCannotDeleteLastDayCycleKey" type="alertmodal"> -Preset already exists! - <tag>fail</tag> +Unable to delete the last key in this day cycle because you cannot have an empty day cycle. You should modify the last remaining key instead of attempting to delete it and then to create a new one. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification - icon="alert.tga" - name="NewWaterPreset" - type="alert"> -Give me a name for the new water preset. - <tag>confirm</tag> - <form name="form"> - <input name="message" type="text"> -New Preset - </input> - <button - default="true" - index="0" - name="OK" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> + functor="GenericAcknowledge" + icon="alertmodal.tga" + name="DayCycleTooManyKeyframes" + type="alertmodal"> +You cannot add any more keyframes to this day cycle. The maximum number of keyframes for day cycles of [SCOPE] scope is [MAX]. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification + functor="GenericAcknowledge" icon="alertmodal.tga" - name="ExistsWaterPresetAlert" + name="EnvUpdateRate" type="alertmodal"> -Preset already exists! - <tag>fail</tag> + You may only update region environmental settings every [WAIT] seconds. Wait at least that long and then try again. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification icon="alertmodal.tga" - name="WaterNoEditDefault" + name="PPSaveEffectAlert" type="alertmodal"> -You cannot edit or delete a default preset. - <tag>fail</tag> +PostProcess Effect exists. Do you still wish overwrite it? + <usetemplate + name="okcancelbuttons" + notext="No" + yestext="Yes"/> </notification> <notification @@ -5668,6 +5628,15 @@ This area has building disabled. You can't build or rez objects here. <notification icon="notify.tga" + name="SeeAvatars" + persist="true" + type="notify" + unique="true"> +This parcel hides avatars and text chat from another parcel. You can't see other residents outside the parcel, and those outside are not able to see you. Regular text chat on channel 0 is also blocked. + </notification> + + <notification + icon="notify.tga" name="ScriptsStopped" persist="true" type="notify"> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 82dfb445da..2ec2e03e8c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -220,7 +220,7 @@ height="23" layout="topleft" left_pad="4" - name="layout_panel1" + name="layout_panel2" user_resize="false" auto_resize="true" width="146"> diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml new file mode 100644 index 0000000000..d06190ec54 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_inventory_panel + name="inventory_inbox" + start_folder="Received Items" + follows="all" layout="topleft" + top="0" left="0" height="165" width="308" + top_pad="0" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + show_item_link_overlays="true" + > + <scroll reserve_scroll_corner="false" /> +</inbox_inventory_panel> diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml new file mode 100644 index 0000000000..af32056428 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inventory_panel + name="inventory_outbox" + start_folder="Outbox" + follows="all" layout="topleft" + top="0" left="0" height="165" width="308" + top_pad="0" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + show_item_link_overlays="true" + > + <scroll reserve_scroll_corner="false" /> +</inventory_panel> diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 774a9e8bbf..e280115bda 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -153,6 +153,14 @@ name="icon_DamageNo" translate="false" value="Parcel_DamageNo_Dark" /> + <string + name="icon_SeeAVs_Off" + translate="false" + value="Parcel_SeeAVsOff_Dark" /> + <string + name="icon_SeeAVs_On" + translate="false" + value="Parcel_SeeAVsOn_Dark" /> <button follows="top|left" height="24" @@ -354,7 +362,7 @@ title="Parcel"> <panel follows="all" - height="175" + height="200" layout="topleft" left="0" name="parcel_characteristics_panel" @@ -543,6 +551,31 @@ top_delta="0" value="Off" width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_SeeAVsOff_Dark" + layout="topleft" + left="10" + name="see_avatars_icon" + top_pad="7" + width="22" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="8" + name="see_avatars_label" + value="See Avatars:" + width="90" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="0" + name="see_avatars_value" + value="Off" + width="60" /> <button follows="bottom|right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 2868d91cc7..4535c56339 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -132,4 +132,12 @@ name="cancel_btn" top="700" width="90" /> + <web_browser + follows="all" + layout="topleft" + left="0" + name="login_media_panel" + width="1024" + height="768" + top="0"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml new file mode 100644 index 0000000000..aa38c49fae --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<panel + border="true" + follows="top|left" + height="300" + label="Environment" + layout="topleft" + help_topic="panel_region_environment_tab" + name="panel_env_info" + width="530"> + <text + name="water_settings_title" + follows="top|left" + height="30" + layout="topleft" + left="50" + top_pad="20" + width="430" + wrap="true"> + Select the Water and Sky/Day Cycle Settings you would like all visitors to your region to see. More info + </text> + <view_border + bevel_style="none" + follows="top|left" + height="237" + layout="topleft" + left="50" + name="border" + top="60" + width="430"/> + <radio_group + follows="top|left" + height="45" + layout="topleft" + left_delta="10" + name="region_settings_radio_group" + top_delta="20" + width="200"> + <radio_item + label="Use Second Life default" + layout="topleft" + name="use_sl_default_settings"/> + <radio_item + label="Use the following settings" + layout="topleft" + name="use_my_settings" + top_pad="20"/> + </radio_group> + <panel + follows="top|left" + height="150" + layout="topleft" + left="50" + name="user_environment_settings" + top_pad="20" + width="430"> + <text + name="water_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top_pad="0" + width="160"> + Water Setting + </text> + <combo_box + follows="top|left" + left_pad="2" + name="water_settings_preset_combo" + top_delta="-7" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + <text + name="sky_dayc_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="50" + top_pad="30" + width="100"> + Sky / Day Cycle + </text> + <radio_group + layout="topleft" + left_delta="50" + name="sky_dayc_settings_radio_group" + top_pad="10" + height="50" + width="110"> + <radio_item + layout="topleft" + label="Fixed sky" + name="my_sky_settings"/> + <radio_item + layout="topleft" + label="Day cycle" + name="my_dayc_settings" + top_pad="25"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="sky_settings_preset_combo" + top_delta="-7" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + <combo_box + follows="top|left" + name="dayc_settings_preset_combo" + top_delta="36" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0"/> + </combo_box> + </panel> + <button + follows="left|top" + height="23" + label="Apply" + layout="topleft" + right="-160" + name="apply_btn" + top_pad="10" + width="100" /> + <button + follows="left|top" + height="23" + label="Cancel" + layout="topleft" + left_pad="10" + name="cancel_btn" + width="100" /> + <loading_indicator + height="23" + left="50" + name="progress_indicator" + top_delta="0" + visible="false" + width="23" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 1307d807e2..6b28639a77 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="false" + border="true" follows="top|left" height="510" help_topic="panel_region_estate_tab" @@ -20,7 +20,7 @@ name="estate_help_text" top="14" word_wrap="true" - width="300"> + > Changes to settings on this tab will affect all regions in the estate. </text> <text @@ -30,9 +30,10 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + right="160" name="estate_text" top_pad="2" + halign="right" width="140"> Estate: </text> @@ -43,9 +44,9 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + top_delta="0" name="estate_name" - top_delta="16" + left_pad="6" width="150"> (unknown) </text> @@ -56,9 +57,10 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + right="160" name="owner_text" - top_pad="2" + top_pad="6" + halign="right" width="150"> Estate owner: </text> @@ -69,75 +71,68 @@ font="SansSerif" height="20" layout="topleft" - left_delta="0" + top_delta="0" name="estate_owner" - top_delta="16" + left_pad="6" use_ellipses="true" width="290"> (unknown) </text> + <view_border - bevel_style="in" + bevel_style="none" follows="top|left" - height="270" + height="95" layout="topleft" - left_delta="-4" + left="10" top_pad="5" - width="300" /> + width="470" /> + <check_box height="20" - label="Use Global Time" + label="Allow Public Access" layout="topleft" - left="12" - name="use_global_time_check" - top="132" + left="20" + name="externally_visible_check" + top_delta="5" width="200" /> + <check_box height="20" - label="Fixed Sun" - layout="topleft" - left="12" - name="fixed_sun_check" - top="152" - width="100" /> - <icon - height="20" - image_name="icon_day_cycle.tga" + label="Allow Voice Chat" layout="topleft" - left="47" - name="daycycle" - top="177" - width="165" /> - <slider - follows="left|top" - height="20" - increment="0.001" - label="Phase" - layout="topleft" - left="12" - max_val="30" - min_val="6" - name="sun_hour_slider" - show_text="false" - top="202" + left="280" + name="voice_chat_check" + top_delta="0" width="200" /> <check_box height="20" - label="Allow Public Access" + label="Allow Direct Teleport" layout="topleft" left_delta="0" - name="externally_visible_check" - top_pad="6" - width="200" /> + name="allow_direct_teleport" + top_pad="4" + width="80" /> + <button + enabled="false" + follows="left|top" + height="23" + label="Apply" + layout="topleft" + name="apply_btn" + top_pad="15" + left_delta="0" + width="97" /> + <text type="string" length="1" follows="top|left" height="16" layout="topleft" - left="32" + left="20" name="Only Allow" - top="250" + top_delta="-30" width="278"> Restrict Access to accounts verified by: </text> @@ -161,50 +156,6 @@ tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information." top_pad="2" width="278" /> - <check_box - height="20" - label="Allow Voice Chat" - layout="topleft" - left="12" - name="voice_chat_check" - top="304" - width="200" /> - <check_box - height="20" - label="Allow Direct Teleport" - layout="topleft" - left="12" - name="allow_direct_teleport" - top_pad="4" - width="80" /> - <button - enabled="false" - follows="left|top" - height="23" - label="Apply" - layout="topleft" - name="apply_btn" - top_pad="10" - left="110" - width="97" /> - <button - follows="left|top" - height="23" - label="Send Message To Estate..." - layout="topleft" - left="45" - name="message_estate_btn" - top_pad="20" - width="220" /> - <button - follows="left|top" - height="23" - label="Kick Resident from Estate..." - layout="topleft" - left="45" - name="kick_user_from_estate_btn" - top_pad="5" - width="220" /> <text type="string" @@ -214,16 +165,31 @@ height="20" layout="topleft" name="estate_manager_label" - right="520" + top_pad="30" + left="10" width="200"> Estate Managers: </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="280" + name="allow_resident_label" + top_delta="0" + width="200"> + Allowed Residents: + </text> + + <!-- Estate Managers box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" + left="10" top_pad="-5" width="200" /> <name_list @@ -235,43 +201,15 @@ name="estate_manager_name_list" top_delta="0" width="200" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_estate_manager_btn" - right="520" - top_pad="5" - width="97" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left_delta="-103" - name="add_estate_manager_btn" - top_delta="0" - width="97" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="allow_resident_label" - top_pad="10" - width="200"> - Allowed Residents: - </text> + + <!-- Allowed Residents box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" - top_pad="-5" + left="280" + top_delta="0" width="200" /> <name_list follows="left|top" @@ -282,42 +220,78 @@ name="allowed_avatar_name_list" top_delta="0" width="200" /> + + <!-- Estate Managers buttons --> + <button + follows="left|top" + height="23" + label="Add..." + layout="topleft" + left="10" + name="add_estate_manager_btn" + top_pad="6" + width="97" /> <button follows="left|top" height="23" label="Remove..." layout="topleft" - name="remove_allowed_avatar_btn" - right="520" - top_pad="5" + name="remove_estate_manager_btn" + left_pad="6" width="97" /> + + <!-- Allowed Residents buttons --> <button follows="left|top" height="23" + left="280" label="Add..." layout="topleft" - left_delta="-103" name="add_allowed_avatar_btn" top_delta="0" width="97" /> + <button + follows="left|top" + height="23" + label="Remove..." + layout="topleft" + name="remove_allowed_avatar_btn" + left_pad="6" + top_delta="0" + width="97" /> + <text type="string" length="1" follows="left|top" height="20" layout="topleft" - left_delta="0" + left="10" name="allow_group_label" top_pad="10" width="200"> Allowed Groups: </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="280" + name="ban_resident_label" + top_delta="0" + width="200"> + Banned Residents: + </text> + + <!-- Allowed Groups box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" + left="10" top_pad="-5" width="200" /> <name_list @@ -329,43 +303,15 @@ name="allowed_group_name_list" top_delta="0" width="200" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_allowed_group_btn" - right="520" - top_pad="5" - width="97" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left_delta="-103" - name="add_allowed_group_btn" - top_delta="0" - width="97" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="ban_resident_label" - top_pad="10" - width="200"> - Banned Residents: - </text> + + <!-- Banned Residents box --> <view_border bevel_style="none" follows="top|left" height="71" layout="topleft" - right="520" - top_pad="-5" + left="280" + top_delta="0" width="200" /> <name_list follows="left|top" @@ -376,22 +322,64 @@ name="banned_avatar_name_list" top_delta="0" width="200" /> + + <!-- Allowed Groups buttons --> + <button + follows="left|top" + height="23" + label="Add..." + layout="topleft" + left="10" + name="add_allowed_group_btn" + top_pad="6" + width="97" /> <button follows="left|top" height="23" label="Remove..." layout="topleft" - name="remove_banned_avatar_btn" - right="520" - top_pad="5" + name="remove_allowed_group_btn" + left_pad="6" + top_delta="0" width="97" /> + + <!-- Banned Residents buttons --> <button follows="left|top" height="23" label="Add..." layout="topleft" - left_delta="-103" + left="280" name="add_banned_avatar_btn" top_delta="0" width="97" /> + <button + follows="left|top" + height="23" + label="Remove..." + layout="topleft" + name="remove_banned_avatar_btn" + top_delta="0" + left_pad="6" + width="97" /> + + <button + follows="left|top" + height="23" + label="Send Message To Estate..." + layout="topleft" + left="10" + name="message_estate_btn" + top_pad="20" + width="220" /> + <button + follows="left|top" + height="23" + label="Kick Resident from Estate..." + layout="topleft" + left="280" + name="kick_user_from_estate_btn" + top_delta="0" + width="220" /> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index 5093c52129..bbb8b40594 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -2,7 +2,7 @@ <panel border="true" follows="top|left" - height="320" + height="460" help_topic="panel_region_terrain_tab" label="Terrain" layout="topleft" @@ -50,10 +50,10 @@ label="Terrain Raise Limit" label_width="120" layout="topleft" - left="15" + left="240" max_val="100" name="terrain_raise_spin" - top="60" + top="40" width="180" /> <spinner follows="left|top" @@ -62,95 +62,336 @@ label="Terrain Lower Limit" label_width="120" layout="topleft" - left="15" + left="240" max_val="0" min_val="-100" name="terrain_lower_spin" - top="80" + top="60" width="180" /> - <check_box + <view_border + bevel_style="none" + follows="top|left" + height="60" + layout="topleft" + left="8" + top="30" + width="460" /> + <text + type="string" + length="1" + follows="left|top" height="20" - label="Use Estate Sun" layout="topleft" - left="250" - name="use_estate_sun_check" - top="35" + left="10" + name="detail_texture_text" + top="110" + width="300"> + Terrain Textures (requires 512x512, 24 bit .tga files) + </text> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_delta="0" + name="texture_detail_0" + top_delta="20" width="100" /> - <check_box - height="20" - label="Fixed Sun" + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_pad="10" + name="texture_detail_1" + top_delta="0" + width="100" /> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_pad="10" + name="texture_detail_2" + top_delta="0" + width="100" /> + <texture_picker + follows="left|top" + height="100" layout="topleft" - left="250" - name="fixed_sun_check" - top="55" + left_pad="10" + name="texture_detail_3" + top_delta="0" width="100" /> - <icon + <text + type="string" + length="1" + follows="left|top" height="20" - image_name="icon_day_cycle.tga" layout="topleft" - left="285" - name="daycycle" - top="80" - width="165" /> - <slider + left="10" + name="height_text_lbl" + top_delta="90" + width="65"> + 1 (Low) + </text> + <text + type="string" + length="1" follows="left|top" height="20" - increment="0.001" - label="Phase" layout="topleft" - left="250" - max_val="30" - min_val="6" - name="sun_hour_slider" - show_text="false" - top="105" - width="200" /> - <button - enabled="false" + left_pad="45" + name="height_text_lbl2" + top_delta="0" + width="100"> + 2 + </text> + <text + type="string" + length="1" follows="left|top" height="20" - label="Apply" layout="topleft" - left="350" - name="apply_btn" - top="135" - width="90" /> - <view_border - bevel_style="none" - follows="top|left" - height="130" + left_pad="10" + name="height_text_lbl3" + top_delta="0" + width="100"> + 3 + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" layout="topleft" - left="8" - top="30" - width="460" /> + left_pad="10" + name="height_text_lbl4" + top_delta="0" + width="100"> + 4 (High) + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="height_text_lbl5" + top_delta="30" + width="300"> + Texture Elevation Ranges + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left="10" + name="height_text_lbl10" + top_delta="30" + width="200" + word_wrap="true"> + These values represent the blend range for the textures above. + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_delta="0" + name="height_text_lbl11" + top_delta="32" + width="200" + word_wrap="true"> + Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4. + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left="270" + name="height_text_lbl6" + top="250" + width="100"> + Northwest + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl7" + top_delta="0" + width="100"> + Northeast + </text> +<!-- northwest low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_start_spin_1" + top_delta="15" + width="100" /> +<!-- northeast low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_start_spin_3" + top_delta="0" + width="100" /> +<!-- northwest high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_range_spin_1" + top_delta="20" + width="100" /> +<!-- northeast high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_range_spin_3" + top_delta="0" + width="100" /> + <text + follows="left|top" + height="20" + layout="topleft" + left="270" + name="height_text_lbl8" + top_pad="10" + width="100"> + Southwest + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl9" + top_delta="0" + width="100"> + Southeast + </text> +<!-- southwest low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_start_spin_0" + top_delta="15" + width="100" /> +<!-- southeast low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_start_spin_2" + top_delta="0" + width="100" /> +<!--southwest high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="230" + max_val="500" + min_val="-500" + name="height_range_spin_0" + top_delta="20" + width="100" /> +<!-- southeast high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_range_spin_2" + top_delta="0" + width="100" /> +<!-- Terrain Download/Upload/Bake buttons --> <button follows="left|top" height="20" label="Download RAW terrain..." layout="topleft" - left_delta="2" + left="10" name="download_raw_btn" tool_tip="Available only to estate owners, not managers" - top_pad="60" - width="170" /> + top="390" + width="160" /> <button follows="left|top" height="20" label="Upload RAW terrain..." layout="topleft" - left="10" + left_pad="10" + top_delta="0" name="upload_raw_btn" tool_tip="Available only to estate owners, not managers" - top="243" - width="170" /> + width="160" /> <button follows="left|top" height="20" label="Bake Terrain" layout="topleft" - left="10" + left_pad="10" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits" - top="283" + width="100" /> + <button + enabled="true" + follows="left|top" + height="20" + label="Apply" + layout="topleft" + left_delta="0" + name="apply_btn" + top="430" width="100" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml deleted file mode 100644 index 5d910ea659..0000000000 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ /dev/null @@ -1,327 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="true" - follows="top|left" - height="320" - help_topic="panel_region_texture_tab" - label="Ground Textures" - layout="topleft" - left="0" - name="Textures" - top="320" - width="480"> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="10" - name="region_text_lbl" - top="10" - width="100"> - Region: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="50" - name="region_text" - top_delta="0" - width="400"> - unknown - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="detail_texture_text" - top="36" - width="300"> - Terrain Textures (requires 512x512, 24 bit .tga files) - </text> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_delta="0" - name="texture_detail_0" - top_delta="20" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_1" - top_delta="0" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_2" - top_delta="0" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_3" - top_delta="0" - width="100" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl" - top="146" - width="65"> - 1 (Low) - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="45" - name="height_text_lbl2" - top_delta="0" - width="100"> - 2 - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl3" - top_delta="0" - width="100"> - 3 - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl4" - top_delta="0" - width="100"> - 4 (High) - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl5" - top="170" - width="300"> - Texture Elevation Ranges - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left="51" - name="height_text_lbl6" - top="185" - width="100"> - Northwest - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl7" - top_delta="0" - width="100"> - Northeast - </text> -<!-- northwest low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_start_spin_1" - top_delta="15" - width="100" /> -<!-- northeast low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_3" - top_delta="0" - width="100" /> -<!-- northwest high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_range_spin_1" - top_delta="20" - width="100" /> -<!-- northeast high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_3" - top_delta="0" - width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="51" - name="height_text_lbl8" - top_pad="10" - width="100"> - Southwest - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl9" - top_delta="0" - width="100"> - Southeast - </text> -<!-- southwest low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_start_spin_0" - top_delta="15" - width="100" /> -<!-- southeast low--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_2" - top_delta="0" - width="100" /> -<!--southwest high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_range_spin_0" - top_delta="20" - width="100" /> -<!-- southeast high--> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_2" - top_delta="0" - width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl10" - top_delta="30" - width="400" - word_wrap="true"> - These values represent the blend range for the textures above. - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="height_text_lbl11" - top_delta="32" - width="400" - word_wrap="true"> - Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4. - </text> - <button - enabled="false" - follows="left|bottom" - height="20" - label="Apply" - layout="topleft" - left="350" - name="apply_btn" - top="290" - width="100" /> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 6ef93406ec..0f330a7b98 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -142,6 +142,7 @@ mouse_opaque="false" background_visible="true" > + <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" /> <panel class="sidepanel_inventory" name="sidepanel_inventory" diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index 30d3064e14..79f29777ce 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -88,6 +88,16 @@ visible="false" width="14" /> + <icon + follows="right|top" + height="13" + image_name="Parcel_SeeAVsOff_Light" + left="2" + name="see_avatars_icon" + top="3" + visible="false" + width="14" + /> <text follows="right|top" font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 8997c1a6d7..79a0ec7c72 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -9,7 +9,7 @@ min_width="240" name="objects panel" width="333"> - <panel + <panel follows="all" layout="topleft" left="0" @@ -19,24 +19,226 @@ height="570" visible="true" width="330"> - <panel - class="panel_main_inventory" - filename="panel_main_inventory.xml" - follows="all" - layout="topleft" - left="0" - name="panel_main_inventory" - top="0" - label="" - height="545" - width="330" /> + <layout_stack + follows="left|right|top|bottom" + layout="topleft" + left="0" + top="0" + orientation="vertical" + name="inventory_layout_stack" + height="535" + width="330"> + <layout_panel + name="main_inventory_layout_panel" + min_dim="150" + width="330" + follows="bottom|left|right" + user_resize="false" + height="480"> + <panel + class="panel_main_inventory" + filename="panel_main_inventory.xml" + follows="all" + layout="topleft" + left="0" + name="panel_main_inventory" + top="0" + label="" + height="480" + width="330" /> + </layout_panel> + <layout_panel + width="330" + auto_resize="true" + user_resize="false" + follows="bottom|left|right" + name="inbox_layout_panel" + visible="false" + min_dim="35" + max_dim="200" + expanded_min_dim="90" + height="200"> + <panel + follows="all" + layout="topleft" + left="0" + name="marketplace_inbox" + class="panel_marketplace_inbox" + top="0" + label="" + height="200" + width="330"> + <string name="InboxLabelWithArg">Received Items ([NUM])</string> + <string name="InboxLabelNoArg">Received Items</string> + <button + label="Received Items" + name="inbox_btn" + height="35" + width="308" + image_unselected="MarketplaceBtn_Off" + image_selected="MarketplaceBtn_Selected" + halign="left" + handle_right_mouse="false" + follows="top|left|right" + is_toggle="true" + tab_stop="false" + pad_left="35" + top="0" + left="10" /> + <text + type="string" + length="1" + follows="right|top" + layout="topleft" + height="13" + top="10" + right="-20" + name="inbox_fresh_new_count" + font="SansSerifMedium" + halign="right" + text_color="EmphasisColor" + top_pad="0" + width="300"> + [NUM] New + </text> + <panel + follows="all" + left="10" + bottom="200" + width="308" + top="35" + bg_opaque_color="InventoryBackgroundColor" + background_visible="true" + background_opaque="true" + tool_tip="Drag and drop items to your inventory to manage and use them" + > + <text + name="inbox_inventory_placeholder" + type="string" + follows="all" + layout="topleft" + top="0" + left="0" + width="308" + height="165" + wrap="true" + halign="center"> + Purchases from the marketplace will be delivered here. + </text> + </panel> + </panel> + </layout_panel> + <layout_panel + width="330" + auto_resize="true" + user_resize="false" + follows="bottom|left|right" + name="outbox_layout_panel" + visible="false" + min_dim="35" + max_dim="200" + expanded_min_dim="90" + height="200"> + <panel + follows="all" + layout="topleft" + left="10" + name="marketplace_outbox" + class="panel_marketplace_outbox" + top="0" + label="" + height="200" + width="310"> + <button + label="Merchant Outbox" + is_toggle="true" + handle_right_mouse="false" + name="outbox_btn" + follows="top|left|right" + image_unselected="MarketplaceBtn_Off" + image_selected="MarketplaceBtn_Selected" + height="35" + tab_stop="false" + width="308" + halign="left" + pad_left="35" + top="0" + left="0" /> + <button + image_unselected="OutboxPush_Off" + image_selected="OutboxPush_Selected" + image_hover_selected="OutboxPush_Selected_Over" + image_hover_unselected="OutboxPush_Over" + image_disabled_selected="OutboxPush_Selected_Disabled" + image_disabled="OutboxPush_Disabled" + image_pressed="OutboxPush_Press" + image_pressed_selected="OutboxPush_Selected_Press" + label="" + tool_tip="Push to my Marketplace Storefront" + is_toggle="false" + name="outbox_sync_btn" + follows="top|right" + tab_stop="false" + halign="center" + top="6" + left="-50" + height="23" + width="32" + enabled="false" /> + <loading_indicator + follows="top|right" + name="outbox_sync_indicator" + top="6" + left="-50" + height="23" + width="32" + images_per_sec="1.15" + tab_stop="false" + visible="false"> + <images> + <image name="OutboxPush_Progress_1"/> + <image name="OutboxPush_Progress_2"/> + <image name="OutboxPush_Progress_3"/> + <image name="OutboxPush_Progress_4"/> + <image name="OutboxPush_Progress_5"/> + <image name="OutboxPush_Progress_6"/> + </images> + </loading_indicator> + <panel + follows="all" + left="10" + bottom="200" + width="308" + top="35" + bg_opaque_color="InventoryBackgroundColor" + background_visible="true" + background_opaque="true" + tool_tip="Drag and drop items here to prepare them for sale on your storefront" + > + <text + name="outbox_inventory_placeholder" + type="string" + follows="all" + layout="topleft" + top="0" + left="0" + width="308" + height="165" + wrap="true" + halign="center"> + Set up your merchant account to use this feature. + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel follows="bottom|left|right" - height="25" + height="30" layout="topleft" name="button_panel" left="9" - top_pad="-2" + top_pad="7" width="308"> <layout_stack follows="bottom|left|right" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 143a989d32..2e2ef6ee19 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1759,10 +1759,10 @@ integer llGetParcelMaxPrims(vector pos, integer sim_wide) Returns the maximum number of prims allowed on the parcel at pos </string> <string name="LSLTipText_llGetParcelDetails" translate="false"> -list llGetParcelDetails(vector pos, list params) -Returns the parcel details specified in params for the parcel at pos. -Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA - </string> + list llGetParcelDetails(vector pos, list params) + Returns the parcel details specified in params for the parcel at pos. + Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS + </string> <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false"> llSetLinkPrimitiveParams(integer linknumber, list rules) Sets primitive parameters for linknumber based on rules @@ -2021,6 +2021,8 @@ Returns a string with the requested data about the region <string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string> <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> + <string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string> + <string name="InventoryOutboxNoItems">Drag items here in preparation for listing on your marketplace storefront.</string> <!-- use value="" because they have preceding spaces --> <string name="no_transfer" value=" (no transfer)" /> <string name="no_modify" value=" (no modify)" /> @@ -2355,6 +2357,10 @@ Returns a string with the requested data about the region <string name="GroupOwned">Group Owned</string> <string name="Public">Public</string> + <!-- Environment settings --> + <string name="LocalSettings">Local Settings</string> + <string name="RegionSettings">Region Settings</string> + <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> @@ -3136,6 +3142,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="LocationCtrlAdultIconTooltip">Adult Region</string> <string name="LocationCtrlModerateIconTooltip">Moderate Region</string> <string name="LocationCtrlGeneralIconTooltip">General Region</string> + <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml new file mode 100644 index 0000000000..f77c4b7178 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/badge.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Additional attributes: + --> +<badge border_image="Badge_Border" + border_color="BadgeBorderColor" + font="SansSerifSmall" + image="Badge_Background" + image_color="BadgeImageColor" + label_color="BadgeLabelColor" + location="top_left" + location_percent_hcenter="85" + location_percent_vcenter="85" + padding_horiz="7" + padding_vert="4" + requests_front="true" + > +</badge> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 16241ed84e..302014eb24 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -25,5 +25,6 @@ pad_bottom="3" height="23" scale_image="true" + handle_right_mouse="true" use_draw_context_alpha="true"> </button> diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml new file mode 100644 index 0000000000..2c987b158d --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_folder_view_folder + folder_arrow_image="Folder_Arrow" + folder_indentation="8" + item_height="20" + item_top_pad="4" + selection_image="Rounded_Square" + > + <new_badge label="New" location="right" location_percent_hcenter="70" /> +</inbox_folder_view_folder> diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml new file mode 100644 index 0000000000..830c27bdac --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_inventory_panel show_load_status="false" /> diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml index 93875d66e6..00f4c43915 100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml @@ -3,4 +3,12 @@ bg_opaque_color="InventoryBackgroundColor" background_visible="true" background_opaque="true" - /> + show_load_status="true" + > + <scroll + name="Inventory Scroller" + follows="all" + reserve_scroll_corner="true" + tab_stop="true" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 37d60f1671..44436fb6f2 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -123,6 +123,14 @@ font="SansSerifSmall" text_color="TextFgColor" /> + <see_avatars_icon + name="see_avatars_icon" + width="22" + height="18" + top="21" + follows="right|top" + image_name="Parcel_SeeAVsOff_Light" + /> <combo_button name="Location History" label="" diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index 9bf99fa363..47a210d9b7 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -10,4 +10,5 @@ bg_alpha_image_overlay="White" background_visible="false" background_opaque="false" - chrome="false"/>
\ No newline at end of file + chrome="false" + accepts_badge="true"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml new file mode 100644 index 0000000000..b5bdd564a6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/time.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<time text_enabled_color="LabelTextColor" + text_disabled_color="LabelDisabledColor" + font="SansSerifSmall" + label_width="40" > + <time.up_button name="SpinCtrl Up" + image_unselected="Stepper_Up_Off" + image_selected="Stepper_Up_Press" + tab_stop="false" + follows="left|bottom" /> + <time.down_button name="SpinCtrl Down" + image_unselected="Stepper_Down_Off" + image_selected="Stepper_Down_Press" + tab_stop="false" + follows="left|bottom" /> +</time> diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml deleted file mode 100644 index 9c3ac1be0e..0000000000 --- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITOR DEL CICLO DE UN DÍA"> - <tab_container name="Day Cycle Tabs"> - <panel label="Ciclo de un día" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 12 am - </text> - <text name="WL3am"> - 3 am - </text> - <text name="WL6am"> - 6 am - </text> - <text name="WL9amHash"> - 9 am - </text> - <text name="WL12pmHash"> - 12 pm - </text> - <text name="WL3pm"> - 3 pm - </text> - <text name="WL6pm"> - 6 pm - </text> - <text name="WL9pm"> - 9 pm - </text> - <text name="WL12am2"> - 12 am - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/> - <button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Configuración del fotograma clave: - </text> - <text name="WLCurKeyTimeText"> - Hora clave: - </text> - <spinner label="Hora" name="WLCurKeyHour"/> - <spinner label="Min." name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Modelo predefinido: - </text> - <combo_box label="Predefinido" name="WLKeyPresets"/> - <text name="DayCycleText"> - Intervalo: - </text> - <combo_box label="5 min." name="WLSnapOptions"/> - <text name="DayCycleText2"> - Duración del ciclo: - </text> - <spinner label="Hora" name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Seg." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Vista previa: - </text> - <button label="Probar" label_selected="Probar" name="WLAnimSky"/> - <button label="Parar" label_selected="Parar" name="WLStopAnimSky"/> - <button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/> - <button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/> - <button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml deleted file mode 100644 index 195690f546..0000000000 --- a/indra/newview/skins/default/xui/es/floater_env_settings.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDITOR DEL ENTORNO"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Duración de -un día - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Nubosidad - </text> - <text name="EnvWaterColorText"> - Color del -agua - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Pulsa para abrir el selector de color"/> - <text name="EnvWaterFogText"> - Claridad del -agua - </text> - <button bottom="-144" label="Usar el horario del estado" name="EnvUseEstateTimeButton" width="155"/> - <button label="Cielo avanzado" left="167" name="EnvAdvancedSkyButton" width="155"/> - <button label="Agua avanzada" left="326" name="EnvAdvancedWaterButton" width="155"/> -</floater> diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml deleted file mode 100644 index 2c1f6cfbfb..0000000000 --- a/indra/newview/skins/default/xui/es/floater_water.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="EDITOR AVANZADO DEL AGUA"> - <text name="KeyFramePresetsText"> - Agua predefinida: - </text> - <button label="Nueva" label_selected="Nueva" name="WaterNewPreset"/> - <button label="Guardar" label_selected="Guardar" name="WaterSavePreset"/> - <button label="Borrar" label_selected="Borrar" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="CONFIGURACIÓN" name="Settings"> - <text name="BHText"> - Color del agua - </text> - <button label="?" left="175" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Pulsa para abrir el selector de color"/> - <text name="WaterFogDensText"> - Transparencia - </text> - <button label="?" left="175" name="WaterFogDensityHelp"/> - <text name="WaterUnderWaterFogModText"> - Modificar la claridad del agua - </text> - <button label="?" left="175" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Tamaño de las ondulaciones - </text> - <button label="?" left="405" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Escala de Fresnel - </text> - <button label="?" left="405" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Coeficiente de reflexión - </text> - <button label="?" left="405" name="WaterFresnelOffsetHelp"/> - <text name="DensMultText"> - Refracción de la superficie - </text> - <button label="?" left="640" name="WaterScaleAboveHelp"/> - <text name="WaterScaleBelowText"> - Refracción bajo la superficie - </text> - <button label="?" left="640" name="WaterScaleBelowHelp"/> - <text name="MaxAltText"> - Desenfoque - </text> - <button label="?" left="640" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="IMAGEN" name="Waves"> - <text name="BHText"> - Sentido de la onda grande - </text> - <button label="?" left="170" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Sentido de la onda pequeña - </text> - <button label="?" left="170" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Vista Normal - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml deleted file mode 100644 index 585a42e429..0000000000 --- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="EDITOR AVANZADO DEL CIELO"> - <text name="KeyFramePresetsText"> - Cielos definidos: - </text> - <button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/> - <button label="Guardar" label_selected="Guardar" name="WLSavePreset"/> - <button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/> - <button font="SansSerifSmall" label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" left_delta="90" name="WLDayCycleMenuButton" width="150"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMÓSFERA" name="Atmosphere"> - <text name="BHText"> - Coloración - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - V - </text> - <text name="BHText4"> - A - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Cantidad de bruma - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Saturación - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - V - </text> - <text name="BHText8"> - A - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densidad de la bruma - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Densidad - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Distancia - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitud máx. - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="LUZ" name="Lighting"> - <text name="SLCText"> - Color del Sol y de la Luna - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - A - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Posición del Sol y la Luna - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Ambiental - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - V - </text> - <text name="BHText7"> - A - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Ángulo de elevación - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Resplandor del Sol - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Visión" name="WLGlowB"/> - <slider label="Tamaño" name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma de la escena - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Brillo de las estrellas - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUBES" name="Clouds"> - <text name="WLCloudColorText"> - Color de las nubes - </text> - <button label="?" left="190" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - A - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Posición/Densidad de las nubes - </text> - <button label="?" left="190" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Nubosidad - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Altitud de las nubes - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text font="SansSerifSmall" name="WLCloudDetailText"> - Detalle de las nubes (Posición/Densidad) - </text> - <button label="?" name="WLCloudDetailHelp"/> - <text bottom="-113" name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <slider bottom="-127" name="WLCloudDetailX"/> - <text name="WLCloudScrollXText"> - Velocidad de X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Bloquear" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Velocidad de Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Bloquear" name="WLCloudLockY"/> - <check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/> - <button label="?" left="618" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml index 9b101ee4ba..cda465da9c 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Guardar" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Cancelar" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml deleted file mode 100644 index 0ce17b9dc6..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITEUR DU CYCLE DU JOUR"> - <tab_container name="Day Cycle Tabs"> - <panel label="Cycle du jour" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - Min. - </text> - <text name="WL3am"> - 3h - </text> - <text name="WL6am"> - 6h - </text> - <text name="WL9amHash"> - 9h - </text> - <text name="WL12pmHash"> - Midi - </text> - <text name="WL3pm"> - 15h - </text> - <text name="WL6pm"> - 18h - </text> - <text name="WL9pm"> - 21h - </text> - <text name="WL12am2"> - Min. - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/> - <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Réglages des images-clés : - </text> - <text name="WLCurKeyTimeText"> - Heure de la clé : - </text> - <spinner label="Heure" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Préréglages clés : - </text> - <combo_box label="Préréglage" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap : - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Durée du cycle : - </text> - <spinner label="Heure" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sec" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Aperçu : - </text> - <button label="Lire" label_selected="Lire" name="WLAnimSky"/> - <button label="Arrêter" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Utiliser heure domaine" label_selected="Aller heure domaine" name="WLUseLindenTime"/> - <button label="Enregistrer jour test" label_selected="Enregistrer jour test" name="WLSaveDayCycle"/> - <button label="Charger jour test" label_selected="Charger jour test" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml deleted file mode 100644 index dd714e85b6..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="ÉDITEUR D'ENVIRONNEMENT"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text bottom="-45" name="EnvTimeText" top="29"> - Heure de la -journée - </text> - <text bottom_delta="-36" name="EnvTimeText2"> - Midi - </text> - <text name="EnvCloudText"> - Couverture -nuageuse - </text> - <text bottom="-45" name="EnvWaterColorText" top="29"> - Couleur de -l'eau - </text> - <color_swatch name="EnvWaterColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> - <text name="EnvWaterFogText"> - Brouillard -dans l'eau - </text> - <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="152"/> - <button label="Ciel avancé" left="162" name="EnvAdvancedSkyButton" width="145"/> - <button label="Eau avancée" left="316" name="EnvAdvancedWaterButton" width="145"/> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml deleted file mode 100644 index 7d1e3cd65c..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_water.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="ÉDITEUR D'EAU AVANCÉ"> - <floater.string name="WLDefaultWaterNames"> - Valeur par défaut:Transparente:Bassin:Trouble:Première plaie:SERPENT !!!:Valdez - </floater.string> - <text name="KeyFramePresetsText" width="120"> - Préréglages : - </text> - <button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset"/> - <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/> - <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="PARAMÈTRES" name="Settings"> - <text name="BHText"> - Couleur du brouillard dans l'eau - </text> - <color_swatch left="75" name="WaterFogColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> - <text name="WaterFogDensText"> - Densité du brouillard - </text> - <text name="WaterUnderWaterFogModText"> - Brouillard sous-marin - </text> - <text name="BDensText"> - Échelle des vaguelettes - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - Échelle Fresnel - </text> - <text name="FresnelOffsetText"> - Décalage Fresnel - </text> - <text name="DensMultText"> - Réfraction au-dessus - </text> - <text name="WaterScaleBelowText"> - Réfraction en dessous - </text> - <text name="MaxAltText"> - Multiplicateur de flou - </text> - </panel> - <panel label="IMAGE" name="Waves"> - <text name="BHText"> - Direction grande vague - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Direction petite vague - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Normal Map - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml deleted file mode 100644 index 657e5f5051..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="ÉDITEUR DE CIEL AVANCÉ" width="706"> - <text name="KeyFramePresetsText"> - Préréglages : - </text> - <button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/> - <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/> - <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/> - <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/> - <tab_container name="WindLight Tabs" width="706"> - <panel label="ATMOSPHÈRE" name="Atmosphere"> - <text name="BHText"> - Bleu de l'horizon - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - V - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Quantité de brume - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Densité du bleu - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - V - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densité de la brume - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Multiplicateur de densité - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Multiplicateur de distance - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitude maximum - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="LUMIÈRE" name="Lighting"> - <text name="SLCText"> - Couleur soleil/lune - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Position soleil/lune - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Éclairage ambiant - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - V - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Angle du levant - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Rayonnement du soleil - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Netteté " name="WLGlowB"/> - <slider label="Taille " name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma de la scène - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Éclat des étoiles - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUAGES" name="Clouds"> - <text name="WLCloudColorText"> - Couleur des nuages - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Nuages XY/densité - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Couverture nuageuse - </text> - <button label="?" left="407" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Altitude des nuages - </text> - <button label="?" left="407" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Détails nuages (XY/densité) - </text> - <button bottom_delta="-2" label="?" left="407" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Direction et vitesse X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Verrouiller" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Direction et vitesse Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Verrouiller" name="WLCloudLockY"/> - <check_box label="Nuages classiques" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-Minuit:A-Midi:A-3h:A-15h:A-16h30:A-6h:A-18h:A-9h:A-21h:Barcelone:Blizzard:Bleu mi-journée:Après-midi sur la côte:Coucher de soleil (côte):Valeur par défaut:Coucher de soleil (désert):Belle journée:Gros nuages floconneux:Brumeux:Funky Funky:Funky Funky Funky:Gelatto:Fantôme:Vérités incohérentes:Mi-journée 1:Mi-journée 2:Mi-journée 3:Mi-journée 4:Nuit:Pirate:Mauve:Rêve de navigateur:Sensualité pure - </string> -</floater> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml index 2364d9bbb2..247e18da82 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Enregistrer" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Annuler" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml deleted file mode 100644 index 98c385d29f..0000000000 --- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITOR DELLE CICLO GIORNO/NOTTE"> - <tab_container name="Day Cycle Tabs"> - <panel label="Ciclo giorno/notte" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 0:00 - </text> - <text name="WL3am"> - 3:00 - </text> - <text name="WL6am"> - 6:00 - </text> - <text name="WL9amHash"> - 9:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 24:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/> - <button label_selected="Cancella voce" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Impostazioni del fotogramma chiave: - </text> - <text name="WLCurKeyTimeText"> - Tempo: - </text> - <spinner label="Ora" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Impostazione chiave: - </text> - <combo_box label="Programma:" name="WLKeyPresets"/> - <text name="DayCycleText"> - Raggruppa: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Lunghezza del ciclo: - </text> - <spinner label="Ore" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sec" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Anteprima: - </text> - <button label="Avvia" label_selected="Avvia" name="WLAnimSky"/> - <button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/> - <button label="Usa l'ora della proprietà" label_selected="Vai all'ora della proprietà" name="WLUseLindenTime"/> - <button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/> - <button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_env_settings.xml b/indra/newview/skins/default/xui/it/floater_env_settings.xml deleted file mode 100644 index 1c17c18e84..0000000000 --- a/indra/newview/skins/default/xui/it/floater_env_settings.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDITOR DELL'AMBIENTE"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Ora del -giorno - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Intensità delle -Nuvole - </text> - <text name="EnvWaterColorText"> - Colore -dell'Acqua - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Clicca per aprire il selettore dei colori"/> - <text name="EnvWaterFogText"> - Nebbiosità -dell'acqua - </text> - <button bottom="-144" label="Usa orario della regione" name="EnvUseEstateTimeButton" width="145"/> - <button label="Cielo avanzato" name="EnvAdvancedSkyButton"/> - <button label="Acqua avanzata" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml deleted file mode 100644 index b25f0a6266..0000000000 --- a/indra/newview/skins/default/xui/it/floater_water.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="EDITOR AVANZATO DELL'ACQUA"> - <text name="KeyFramePresetsText" width="245"> - Impostazioni predeterminate dell'acqua: - </text> - <combo_box left_delta="245" name="WaterPresetsCombo" width="150"/> - <button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/> - <button label="Salva" label_selected="Salva" name="WaterSavePreset"/> - <button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="IMPOSTAZIONI" name="Settings"> - <text name="BHText"> - Colore della nebbiosità dell'acqua - </text> - <button label="?" left="209" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Clicca per aprire il selettore dei colori"/> - <text font="SansSerifSmall" name="WaterFogDensText"> - Esponente di densità della nebbia - dell'acqua - </text> - <slider bottom_delta="-40" name="WaterFogDensity"/> - <button label="?" left="209" name="WaterFogDensityHelp"/> - <text bottom="-140" font="SansSerifSmall" name="WaterUnderWaterFogModText"> - Regolatore effetto nebbia subacquea - </text> - <button label="?" left="209" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Scala di riflessione delle onde - </text> - <button label="?" left="415" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Scala Fresnel - </text> - <button label="?" left="415" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Offset Fresnel - </text> - <button label="?" left="415" name="WaterFresnelOffsetHelp"/> - <text font="SansSerifSmall" name="DensMultText"> - Scala di rifrazione nell'acqua - dall'alto - </text> - <slider bottom_delta="-40" name="WaterScaleAbove"/> - <button label="?" left="650" name="WaterScaleAboveHelp"/> - <text bottom="-70" font="SansSerifSmall" name="WaterScaleBelowText"> - Scala di rifrazione nell'acqua - dal basso - </text> - <slider bottom_delta="-40" name="WaterScaleBelow"/> - <button label="?" left="650" name="WaterScaleBelowHelp"/> - <text bottom="-122" name="MaxAltText"> - Moltiplicatore della sfocatura - </text> - <button label="?" left="650" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="IMMAGINE" name="Waves"> - <text name="BHText"> - Direzione della grande onda - </text> - <button label="?" left="170" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Direzione della piccola onda - </text> - <button label="?" left="170" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Mappatura normale - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml deleted file mode 100644 index 6828d05be0..0000000000 --- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="EDITOR AVANZATO DEL CIELO"> - <text name="KeyFramePresetsText" width="105"> - Cieli predefiniti: - </text> - <combo_box left_delta="105" name="WLPresetsCombo"/> - <button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/> - <button label="Salva" label_selected="Salva" left_delta="72" name="WLSavePreset"/> - <button label="Elimina" label_selected="Elimina" left_delta="72" name="WLDeletePreset"/> - <button font="SansSerifSmall" label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" left_delta="85" name="WLDayCycleMenuButton" width="165"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFERA" name="Atmosphere"> - <text name="BHText"> - Blu dell'Orizzonte - </text> - <button label="?" left="189" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text font="SansSerifSmall" name="BDensText"> - Altezza della Foschia all'Orizzonte - </text> - <button label="?" left="189" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Densità del Blu - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densità della Foschia - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Moltiplicatore di Densità - </text> - <button label="?" left="645" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Moltiplicatore della Distanza - </text> - <button label="?" left="645" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitudine Massima - </text> - <button label="?" left="645" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="ILLUMINAZIONE" name="Lighting"> - <text name="SLCText"> - Colore Sole/Luna - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Posizione Sole/Luna - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Ambiente - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Angolo Est - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Corona intorno al sole - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Focus" name="WLGlowB"/> - <slider label="Grandezza" name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma della Scena - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Luminosità delle stelle - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUVOLE" name="Clouds"> - <text name="WLCloudColorText"> - Colore delle Nuvole - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Nuvole XY/Densità - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Copertura delle Nuvole - </text> - <button label="?" left="415" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Altitudine delle Nuvole - </text> - <button label="?" left="415" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Dettagli Nuvole (XY/ Densità) - </text> - <button label="?" left="415" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Scorrimento delle X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Blocca" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Scorrimento delle Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Blocca" name="WLCloudLockY"/> - <check_box label="Mostra le Nuvole Classiche" name="DrawClassicClouds"/> - <button label="?" left="645" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml index 8e464ca037..145b8cf4e3 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Salva luogo preferito" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Annulla" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml deleted file mode 100644 index b0949cd4e0..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="デイサイクル編集"> - <tab_container name="Day Cycle Tabs"> - <panel label="デイサイクル" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 深夜 12時 - </text> - <text name="WL3am"> - 午前 3時 - </text> - <text name="WL6am"> - 午前 6時 - </text> - <text name="WL9amHash"> - 午前 9時 - </text> - <text name="WL12pmHash"> - 正午 12時 - </text> - <text name="WL3pm"> - 午後 3時 - </text> - <text name="WL6pm"> - 午後 6時 - </text> - <text name="WL9pm"> - 午後 9時 - </text> - <text name="WL12am2"> - 深夜 12時 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="キーの追加" label_selected="キーの追加" name="WLAddKey"/> - <button label="キーの削除" label_selected="キーの削除" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - キーフレームの設定： - </text> - <text name="WLCurKeyTimeText"> - キータイム： - </text> - <spinner label="時間" name="WLCurKeyHour"/> - <spinner label="分" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - キーの事前設定： - </text> - <combo_box label="事前設定" name="WLKeyPresets"/> - <text name="DayCycleText"> - スナップ： - </text> - <combo_box label="5 分" name="WLSnapOptions"/> - <text name="DayCycleText2"> - サイクルの長さ： - </text> - <spinner label="時間" name="WLLengthOfDayHour"/> - <spinner label="分" name="WLLengthOfDayMin"/> - <spinner label="秒" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - プレビュー： - </text> - <button label="再生" label_selected="再生" name="WLAnimSky"/> - <button label="停止" label_selected="停止" name="WLStopAnimSky"/> - <button label="不動産の時刻を使用" label_selected="不動産の時刻に変更" name="WLUseLindenTime"/> - <button label="デイテストを保存" label_selected="デイテストを保存" name="WLSaveDayCycle"/> - <button label="デイテストをロード" label_selected="デイテストをロード" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_env_settings.xml b/indra/newview/skins/default/xui/ja/floater_env_settings.xml deleted file mode 100644 index 1d5f26a6eb..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_env_settings.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="自然環境エディター"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - 時刻 - </text> - <text name="EnvTimeText2"> - 正午 12:00 - </text> - <text name="EnvCloudText"> - 雲の量 - </text> - <text name="EnvWaterColorText"> - 水の色 - </text> - <color_swatch name="EnvWaterColor" tool_tip="クリックしてカラーピッカーを開きます"/> - <text name="EnvWaterFogText"> - 水中照度 - </text> - <button label="不動産の時刻を使用" name="EnvUseEstateTimeButton"/> - <button label="空の高度な設定" name="EnvAdvancedSkyButton"/> - <button label="水の高度な設定" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml deleted file mode 100644 index fb64332e79..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_water.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="水の高度な編集"> - <floater.string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text name="KeyFramePresetsText"> - 水の事前設定： - </text> - <button label="新規" label_selected="新規" name="WaterNewPreset"/> - <button label="保存" label_selected="保存" name="WaterSavePreset"/> - <button label="削除" label_selected="削除" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="設定" name="Settings"> - <text name="BHText"> - 水中のフォグ効果の色 - </text> - <color_swatch name="WaterFogColor" tool_tip="クリックしてカラーピッカーを開きます"/> - <text name="WaterFogDensText"> - 水中の透明度指数 - </text> - <text name="WaterUnderWaterFogModText"> - 水中のフォグ効果加減 - </text> - <text name="BDensText"> - さざ波の反射スケール - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - フレネルのスケール - </text> - <text name="FresnelOffsetText"> - フレネルのオフセット - </text> - <text name="DensMultText"> - 水面の屈折スケール - </text> - <text name="WaterScaleBelowText"> - 水中の屈折スケール - </text> - <text name="MaxAltText"> - 不透明度の増幅 - </text> - </panel> - <panel label="画像" name="Waves"> - <text name="BHText"> - 大波の方向 - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - 小波の方向 - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - ノーマルマップ - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml deleted file mode 100644 index feb94ef73e..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="空の高度な編集"> - <text name="KeyFramePresetsText"> - 空の事前設定： - </text> - <button label="新規" label_selected="新規" name="WLNewPreset"/> - <button label="保存" label_selected="保存" name="WLSavePreset"/> - <button label="削除" label_selected="削除" name="WLDeletePreset"/> - <button label="デイサイクル編集" label_selected="デイサイクル編集" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="大気" name="Atmosphere"> - <text name="BHText"> - 空の配色 - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - 空と遠景の露光 - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - 空の配色と濃度 - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - 大気の不透明度 - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - 大気の不透明度の増幅 - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - 視界の増幅 - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - 最大高度 - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="ライティング" name="Lighting"> - <text name="SLCText"> - 太陽/月の色 - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - 太陽/月の位置 - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - アンビエント - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - 東の角度 - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - 太陽の輝き - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="フォーカス " name="WLGlowB"/> - <slider label="サイズ " name="WLGlowR"/> - <text name="SceneGammaText"> - 風景ガンマ - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - 星の輝き - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="雲" name="Clouds"> - <text name="WLCloudColorText"> - 雲の色 - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - 雲の XY/密度 - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - 雲の量 - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - 雲のスケール - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - 雲の詳細 (XY/密度) - </text> - <button label="?" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - 雲の移動速度 (X 方向) - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="ロック" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - 雲の移動速度 (Y 方向) - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="ロック" name="WLCloudLockY"/> - <check_box label="従来の雲を描画" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml index 4fb031b677..39ea1df1e3 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="ピックを保存" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="取り消し" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml deleted file mode 100644 index 1f3e045a75..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="DAGCYCLUS EDITOR"> - <tab_container name="Day Cycle Tabs"> - <panel label="Dagcyclus" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 0:00 - </text> - <text name="WL3am"> - 3:00 - </text> - <text name="WL6am"> - 6:00 - </text> - <text name="WL9amHash"> - 9:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 0:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Key toevoegen" label_selected="Key toevoegen" name="WLAddKey"/> - <button label="Key verwijderen" label_selected="Key verwijderen" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Gemarkeerde frame instelling: - </text> - <text name="WLCurKeyTimeText"> - Markering tijd: - </text> - <spinner label="Uur" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Markering voorinstelling: - </text> - <combo_box label="Voorinstelling" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Lengte van cyclus: - </text> - <spinner label="Uur" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sec" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Voorbeeld: - </text> - <button label="Afspelen" label_selected="Afspelen" name="WLAnimSky"/> - <button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Gebruik estatetijd" label_selected="Ga naar Estate tijd" name="WLUseLindenTime"/> - <button label="Opslaan testdag" label_selected="Opslaan testdag" name="WLSaveDayCycle"/> - <button label="Laad testdag" label_selected="Laad testdag" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_env_settings.xml b/indra/newview/skins/default/xui/nl/floater_env_settings.xml deleted file mode 100644 index 3c207040d2..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_env_settings.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="OMGEVING EDITOR"> - <text bottom="-42" name="EnvTimeText"> - Tijd van de -dag - </text> - <text bottom_delta="-36" name="EnvTimeText2"> - 0:00 - </text> - <text name="EnvCloudText"> - Wolkendek - </text> - <text name="EnvWaterColorText"> - Waterkleur - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Klik om de kleurkiezer te openen"/> - <text name="EnvWaterFogText"> - Watermist - </text> - <button label="Gebruik estate tijd" name="EnvUseEstateTimeButton"/> - <button label="Geavanceerde lucht" name="EnvAdvancedSkyButton"/> - <button label="Geavanceerd water" name="EnvAdvancedWaterButton"/> - <button label="?" name="EnvSettingsHelpButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_water.xml b/indra/newview/skins/default/xui/nl/floater_water.xml deleted file mode 100644 index 1fb1ca241b..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_water.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="GEAVANCEERDE WATER EDITOR"> - <combo_box bottom="-50" height="18" left_delta="116" name="WaterPresetsCombo" width="150" /> - <text name="KeyFramePresetsText"> - Watervoorinstellingen - </text> - <button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset" left_delta="190"/> - <button label="Opslaan" label_selected="Opslaan" name="WaterSavePreset"/> - <button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset" width="80"/> - <tab_container name="Water Tabs"> - <panel label="Instellingen" name="Settings"> - <text name="BHText"> - Watermistkleur - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Klik om de kleurkiezer te openen"/> - <text name="WaterFogDensText"> - Mistdichtheidsexponent - </text> - <button label="?" name="WaterFogDensityHelp"/> - <text name="WaterUnderWaterFogModText"> - Onderwatermist wijziger - </text> - <button label="?" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Reflectie wavelet schaal - </text> - <button label="?" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Fresnelschaal - </text> - <button label="?" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Fresnelverplaatsing - </text> - <button label="?" name="WaterFresnelOffsetHelp"/> - <text name="DensMultText"> - Refractieschaal boven - </text> - <button label="?" name="WaterScaleAboveHelp"/> - <text name="WaterScaleBelowText"> - Refractieschaal onder - </text> - <button label="?" name="WaterScaleBelowHelp"/> - <text name="MaxAltText"> - Wazigheidvermeerderaar - </text> - <button label="?" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="Afbeelding" name="Waves"> - <text name="BHText"> - Grote golven richting - </text> - <button label="?" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Kleine golf richting - </text> - <button label="?" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Normaalmap - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml deleted file mode 100644 index b26dd7916e..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="GEAVANCEERDE LUCHT EDITOR"> - <combo_box allow_text_entry="false" follows="left|top" mouse_opaque="true" name="WLPresetsCombo"/> - <text name="KeyFramePresetsText"> - Lucht voorinstellingen - </text> - <button label="Nieuw" label_selected="Nieuw" name="WLNewPreset"/> - <button label="Opslaan" label_selected="Opslaan" name="WLSavePreset"/> - <button label="Verwijderen" label_selected="Verwijderen" name="WLDeletePreset"/> - <button label="Dag cyclus editor" label_selected="Dag cyclus editor" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="Atmosfeer" name="Atmosphere"> - <text name="BHText"> - Blauw Horizon - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Nevel horizon - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Blauw dichtheid - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Nevel dichtheid - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Dichtheidsfactor - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Afstandsfactor - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Max hoogte - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="Licht" name="Lighting"> - <text name="SLCText"> - Zon/maan kleur - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Zon/maan positie - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Omgeving - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Oosthoek - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Zonnegloed - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Focus " name="WLGlowB"/> - <slider label="Grootte" name="WLGlowR"/> - <text name="SceneGammaText"> - Scenegamma - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Ster helderheid - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="Wolken" name="Clouds"> - <text name="WLCloudColorText"> - Wolkenkleur - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Wolken (XY/Dichtheid) - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Wolkenbedekking - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Wolkenschaal - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Wolkendetail (XY/Dichtheid) - </text> - <button label="?" name="WLCloudDetailHelp" left="404"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Wolk verplaatsing X - </text> - <button label="?" name="WLCloudScrollXHelp" left="600"/> - <check_box label="Vastzetten" name="WLCloudLockX" left="622"/> - <text name="WLCloudScrollYText"> - Wolk verplaatsing Y - </text> - <button label="?" name="WLCloudScrollYHelp" left="600"/> - <check_box label="Vastzetten" name="WLCloudLockY" left="622"/> - <check_box label="Teken klassieke wolken" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp" left="620"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml deleted file mode 100644 index f3929df3e3..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDYTOR CYKLU DNIA"> - <tab_container name="Day Cycle Tabs"> - <panel label="Cykl dnia" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <multi_slider label="" name="WLTimeSlider"/> - <multi_slider label="" name="WLDayCycleKeys"/> - <text name="WL12am"> - 12am - </text> - <text name="WL3am"> - 3am - </text> - <text name="WL6am"> - 6am - </text> - <text name="WL9amHash"> - 9am - </text> - <text name="WL12pmHash"> - 12pm - </text> - <text name="WL3pm"> - 3pm - </text> - <text name="WL6pm"> - 6pm - </text> - <text name="WL9pm"> - 9pm - </text> - <text name="WL12am2"> - 12am - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Dodaj" label_selected="Dodaj" name="WLAddKey"/> - <button label="Usuń" label_selected="Usuń" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Preferencje czasu: - </text> - <text name="WLCurKeyTimeText"> - Czas: - </text> - <spinner label="Godz" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Ustawienia: - </text> - <combo_box label="Preset" name="WLKeyPresets"/> - <text name="DayCycleText"> - Przerwij: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Długość cyklu: - </text> - <spinner label="Godz" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sek" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Przeglądaj: - </text> - <button label="Start" label_selected="Start" name="WLAnimSky"/> - <button label="Stop" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Używaj czasu regionu" label_selected="Używaj czasu regionu" name="WLUseLindenTime"/> - <button label="Zapisz test dnia" label_selected="Zapisz test dnia" name="WLSaveDayCycle"/> - <button label="Załaduj test dnia" label_selected="Załaduj test dnia" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml deleted file mode 100644 index 3ab854fbbb..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_env_settings.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDYTOR ŚRODOWISKA"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Czas - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <slider label="" name="EnvTimeSlider"/> - <text name="EnvCloudText"> - Chmury: - </text> - <slider label="" name="EnvCloudSlider"/> - <text name="EnvWaterColorText"> - Kolor wody - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij aby wybrać kolor"/> - <text name="EnvWaterFogText"> - Zamglenie: - </text> - <slider label="" name="EnvWaterFogSlider"/> - <button label="Używaj czasu regionu" name="EnvUseEstateTimeButton"/> - <button label="Zaawansowane niebo" name="EnvAdvancedSkyButton"/> - <button label="Zaawansowana woda" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_water.xml b/indra/newview/skins/default/xui/pl/floater_water.xml deleted file mode 100644 index 9720dae516..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_water.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="ZAAWANSOWANY EDYTOR WODY"> - <text name="KeyFramePresetsText"> - Ustawienia wody: - </text> - <button label="Nowe" label_selected="Nowe" name="WaterNewPreset"/> - <button label="Zapisz" label_selected="Zapisz" name="WaterSavePreset"/> - <button label="Usuń" label_selected="Usuń" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="USTAWIENIA" name="Settings"> - <text name="BHText"> - Kolor podwodnej mgły - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Kliknij aby wybrać kolor"/> - <text name="WaterFogDensText"> - Wykładnik gęstości mgły - </text> - <button label="?" name="WaterFogDensityHelp"/> - <slider label="" name="WaterFogDensity"/> - <text name="WaterUnderWaterFogModText"> - Modyfikator mgły - </text> - <button label="?" name="WaterUnderWaterFogModHelp"/> - <slider label="" name="WaterUnderWaterFogMod"/> - <text name="BDensText"> - Skala zmarszczeń - </text> - <button label="?" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <slider label="" name="WaterNormalScaleX"/> - <slider label="" name="WaterNormalScaleY"/> - <slider label="" name="WaterNormalScaleZ"/> - <text name="HDText"> - Skala Fresnela - </text> - <button label="?" name="WaterFresnelScaleHelp"/> - <slider label="" name="WaterFresnelScale"/> - <text name="FresnelOffsetText"> - Przesunięcie Fresnela - </text> - <button label="?" name="WaterFresnelOffsetHelp"/> - <slider label="" name="WaterFresnelOffset"/> - <text name="DensMultText"> - Górna refrakcja - </text> - <button label="?" name="WaterScaleAboveHelp"/> - <slider label="" name="WaterScaleAbove"/> - <text name="WaterScaleBelowText"> - Dolna refrakcja - </text> - <button label="?" name="WaterScaleBelowHelp"/> - <slider label="" name="WaterScaleBelow"/> - <text name="MaxAltText"> - Mnożnik rozmycia - </text> - <button label="?" name="WaterBlurMultiplierHelp"/> - <slider label="" name="WaterBlurMult"/> - </panel> - <panel label="OBRAZ" name="Waves"> - <text name="BHText"> - Kierunek dużych fal - </text> - <button label="?" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <slider label="" name="WaterWave1DirX"/> - <slider label="" name="WaterWave1DirY"/> - <text name="BHText2"> - Kierunek małych fal - </text> - <button label="?" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <slider label="" name="WaterWave2DirX"/> - <slider label="" name="WaterWave2DirY"/> - <text name="BHText3"> - Mapa normalnych - </text> - <button label="?" name="WaterNormalMapHelp"/> - <texture_picker label="" name="WaterNormalMap"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml deleted file mode 100644 index 930e904464..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml +++ /dev/null @@ -1,228 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="ZAAWANSOWANY EDYTOR NIEBA"> - <text name="KeyFramePresetsText"> - Ustawienia nieba: - </text> - <button label="Nowe" label_selected="Nowe" name="WLNewPreset"/> - <button label="Zapisz" label_selected="Zapisz" name="WLSavePreset"/> - <button label="Usuń" label_selected="Usuń" name="WLDeletePreset"/> - <button label="Edytor cyklu dnia" label_selected="Edytor cyklu dnia" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFERA" name="Atmosphere"> - <text name="BHText"> - Horyzont błękitu - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <slider label="" name="WLBlueHorizonR"/> - <slider label="" name="WLBlueHorizonG"/> - <slider label="" name="WLBlueHorizonB"/> - <slider label="" name="WLBlueHorizonI"/> - <text name="BDensText"> - Horyzont zamglenia - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <slider label="" name="WLHazeHorizon"/> - <text name="BDensText2"> - Gęstość błękitu - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <slider label="" name="WLBlueDensityR"/> - <slider label="" name="WLBlueDensityG"/> - <slider label="" name="WLBlueDensityB"/> - <slider label="" name="WLBlueDensityI"/> - <text name="HDText"> - Gęstość zamglenia - </text> - <button label="?" name="WLHazeDensityHelp"/> - <slider label="" name="WLHazeDensity"/> - <text name="DensMultText"> - Mnożnik gęsości - </text> - <button label="?" name="WLDensityMultHelp"/> - <slider label="" name="WLDensityMult"/> - <text name="WLDistanceMultText"> - Mnożnik dystansu - </text> - <button label="?" name="WLDistanceMultHelp"/> - <slider label="" name="WLDistanceMult"/> - <text name="MaxAltText"> - Max wysokość - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - <slider label="" name="WLMaxAltitude"/> - </panel> - <panel label="ŚWIATŁO" name="Lighting"> - <text name="SLCText"> - Kolor Słońca/Księżyca - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLSunlightR"/> - <slider label="" name="WLSunlightG"/> - <slider label="" name="WLSunlightB"/> - <slider label="" name="WLSunlightI"/> - <text name="TODText"> - Pozycja Słońca/Księżyca - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <slider label="" name="WLSunAngle"/> - <text name="WLAmbientText"> - Otoczenie - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <slider label="" name="WLAmbientR"/> - <slider label="" name="WLAmbientG"/> - <slider label="" name="WLAmbientB"/> - <slider label="" name="WLAmbientI"/> - <text name="WLEastAngleText"> - Pozycja wschodu - </text> - <button label="?" name="WLEastAngleHelp"/> - <slider label="" name="WLEastAngle"/> - <text name="SunGlowText"> - Blask Słońca - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Ostrość" name="WLGlowB"/> - <slider label="Rozmiar" name="WLGlowR"/> - <text name="SceneGammaText"> - Jasność obrazu - </text> - <button label="?" name="WLSceneGammaHelp"/> - <slider label="" name="WLGamma"/> - <text name="WLStarText"> - Blask gwiazd - </text> - <button label="?" name="WLStarBrightnessHelp"/> - <slider label="" name="WLStarAlpha"/> - </panel> - <panel label="CHMURY" name="Clouds"> - <text name="WLCloudColorText"> - Kolor chmur - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLCloudColorR"/> - <slider label="" name="WLCloudColorG"/> - <slider label="" name="WLCloudColorB"/> - <slider label="" name="WLCloudColorI"/> - <text name="WLCloudColorText2"> - Chmury (XY/Gęstość) - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - G - </text> - <slider label="" name="WLCloudX"/> - <slider label="" name="WLCloudY"/> - <slider label="" name="WLCloudDensity"/> - <text name="WLCloudCoverageText"> - Pokrycie chmur - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <slider label="" name="WLCloudCoverage"/> - <text name="WLCloudScaleText"> - Skala chmur - </text> - <button label="?" name="WLCloudScaleHelp"/> - <slider label="" name="WLCloudScale"/> - <text name="WLCloudDetailText"> - Szczegóły (XY/gęstość) - </text> - <button label="?" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - G - </text> - <slider label="" name="WLCloudDetailX"/> - <slider label="" name="WLCloudDetailY"/> - <slider label="" name="WLCloudDetailDensity"/> - <text name="WLCloudScrollXText"> - Przewijanie chmur X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Zablokuj" name="WLCloudLockX"/> - <slider label="" name="WLCloudScrollX"/> - <text name="WLCloudScrollYText"> - Przewijanie chmur Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Zablokuj" name="WLCloudLockY"/> - <slider label="" name="WLCloudScrollY"/> - <check_box label="Klasyczne chmury" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml index 8a183c00cf..72c162f63d 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Zapisz obrazek" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Cofnij" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml deleted file mode 100644 index 9560a3b418..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITOR DE CICLO DE DIA"> - <tab_container name="Day Cycle Tabs"> - <panel label="Ciclo do dia" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 0:00 - </text> - <text name="WL3am"> - 3:00 - </text> - <text name="WL6am"> - 6:00 - </text> - <text name="WL9amHash"> - 9:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 24:00 - </text> - <button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/> - <button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Configurações de Quadro-chave: - </text> - <text name="WLCurKeyTimeText"> - Tempo-chave: - </text> - <spinner label="Hora" name="WLCurKeyHour"/> - <spinner label="Minutos" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Ajuste-chave: - </text> - <combo_box label="Ajuste" name="WLKeyPresets"/> - <text name="DayCycleText"> - Grudar: - </text> - <combo_box label="5 minutos" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Duração do Ciclo: - </text> - <spinner label="Hora" name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Seg." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Visualizar - </text> - <button label="Tocar" label_selected="Tocar" name="WLAnimSky"/> - <button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/> - <button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/> - <button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/> - <button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml deleted file mode 100644 index 3ca8d934c9..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDITOR DO AMBIENTE"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Hora do Dia - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Cobertura de -Nuvens - </text> - <text name="EnvWaterColorText"> - Cor da água - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Selecionar a cor"/> - <text name="EnvWaterFogText"> - Névoa da -água - </text> - <button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/> - <button label="Céu Avançado" left="167" name="EnvAdvancedSkyButton" width="155"/> - <button label="Água Avançada" left="326" name="EnvAdvancedWaterButton" width="155"/> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml deleted file mode 100644 index b2a06f4ff2..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_water.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="EDITOR DE ÁGUA AVANÇADO"> - <text name="KeyFramePresetsText" width="175"> - Pré-configurações da Água: - </text> - <combo_box left_delta="175" name="WaterPresetsCombo" width="150"/> - <button label="Novo" label_selected="Novo" name="WaterNewPreset"/> - <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/> - <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="DEFINIÇÕES" name="Settings"> - <text name="BHText"> - Cor da névoa da Água - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Selecionar a cor"/> - <text name="WaterFogDensText"> - Expoente da Densidade de névoa - </text> - <button label="?" left="209" name="WaterFogDensityHelp"/> - <text name="WaterUnderWaterFogModText"> - Modificador da névoa Subaquática - </text> - <button label="?" left="209" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Escala da Marola de Reflexão - </text> - <button label="?" left="415" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Escala de Fresnel - </text> - <button label="?" left="415" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Deslocamento de Fresnel - </text> - <button label="?" left="415" name="WaterFresnelOffsetHelp"/> - <text name="DensMultText"> - Refratar a Escala para Cima - </text> - <button label="?" left="640" name="WaterScaleAboveHelp"/> - <text name="WaterScaleBelowText"> - Refratar a Escala para Baixo - </text> - <button label="?" left="640" name="WaterScaleBelowHelp"/> - <text name="MaxAltText"> - Multiplicador de Difusão - </text> - <button label="?" left="640" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="IMAGEM" name="Waves"> - <text name="BHText"> - Direção da Onda Maior - </text> - <button label="?" left="170" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Direção da Onda Pequena - </text> - <button label="?" left="170" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Mapa Normal - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml deleted file mode 100644 index ec459bbb26..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml +++ /dev/null @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="EDITOR DE CÉU AVANÇADO"> - <text name="KeyFramePresetsText" width="140"> - Pré-definições de Céu: - </text> - <combo_box left_delta="140" name="WLPresetsCombo"/> - <button label="Novo" label_selected="Novo" name="WLNewPreset"/> - <button label="Salvar" label_selected="Salvar" left_delta="72" name="WLSavePreset"/> - <button label="Deletar" label_selected="Deletar" left_delta="72" name="WLDeletePreset"/> - <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" left_delta="84" name="WLDayCycleMenuButton" width="150"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFERA" name="Atmosphere"> - <text name="BHText"> - Horizonte Azul - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Horizonte da Neblina - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Densidade de Azul - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densidade da Neblina - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Multiplicador de Densidade - </text> - <button label="?" left="635" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Multiplicador de Distância - </text> - <button label="?" left="635" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitude Máxima - </text> - <button label="?" left="635" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="ILUMINAÇÃO" name="Lighting"> - <text name="SLCText"> - Cor do Sol/Lua - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Posição do Sol/Lua - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Ambiente - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Ângulo Leste - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Brilho do Sol - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Foco" name="WLGlowB"/> - <slider label="Tamanho" name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma da Cena - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Brilho da Estrela - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUVENS" name="Clouds"> - <text name="WLCloudColorText"> - Cor da Nuvem - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Densidade/ XY da Nuvem - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Cobertura da Nuvem - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Escala da Nuvem - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text font="SansSerifSmall" name="WLCloudDetailText"> - Detalhe da Nuvem (XY/Densidade) - </text> - <button label="?" left="421" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Rolagem X da Nuvem - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Travar" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Rolagem Y da Nuvem - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Travar" name="WLCloudLockY"/> - <check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/> - <button label="?" left="645" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml index 432affcf09..5eb9987e71 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Salvar destaque" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Cancelar" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml deleted file mode 100644 index 28d2ba6ed4..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="日循環編輯器"> - <tab_container name="Day Cycle Tabs"> - <panel label="日循環" name="Day Cycle"> - <multi_slider initial_value="0" name="WLTimeSlider"/> - <multi_slider initial_value="0" name="WLDayCycleKeys"/> - <text name="WL12am"> - 12am - </text> - <text name="WL3am"> - 3am - </text> - <text name="WL6am"> - 6am - </text> - <text name="WL9amHash"> - 9am - </text> - <text name="WL12pmHash"> - 12pm - </text> - <text name="WL3pm"> - 3pm - </text> - <text name="WL6pm"> - 6pm - </text> - <text name="WL9pm"> - 9pm - </text> - <text name="WL12am2"> - 12am - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Add Key" label_selected="Add Key" name="WLAddKey"/> - <button label="Delete Key" label_selected="Delete Key" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Key Frame Settings: - </text> - <text name="WLCurKeyTimeText"> - Key Time: - </text> - <spinner label="Hour" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Key Preset: - </text> - <combo_box label="Preset" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap: - </text> - <combo_box label="五分鐘" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Length of Cycle: - </text> - <spinner label="小時" name="WLLengthOfDayHour"/> - <spinner label="分" name="WLLengthOfDayMin"/> - <spinner label="秒" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - 預覽： - </text> - <button label="Play" label_selected="Play" name="WLAnimSky"/> - <button label="停止!" label_selected="停止" name="WLStopAnimSky"/> - <button label="Use Estate Time" label_selected="Go to Estate Time" name="WLUseLindenTime"/> - <button label="Save Test Day" label_selected="Save Test Day" name="WLSaveDayCycle"/> - <button label="Load Test Day" label_selected="Load Test Day" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml deleted file mode 100644 index 65a97f0cff..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_env_settings.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="ENVIRONMENT EDITOR"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Time of Day - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Cloud Cover - </text> - <text name="EnvWaterColorText"> - Water Color - </text> - <color_swatch name="EnvWaterColor" tool_tip="Click to open color picker"/> - <text name="EnvWaterFogText"> - Water Fog - </text> - <button label="Use Estate Time" name="EnvUseEstateTimeButton"/> - <button label="Advanced Sky" name="EnvAdvancedSkyButton"/> - <button label="Advanced Water" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml deleted file mode 100644 index 5fb57272af..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_water.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="進階水文編輯器"> - <floater.string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text name="KeyFramePresetsText"> - Water Presets: - </text> - <button label="新增" label_selected="新增" name="WaterNewPreset"/> - <button label="儲存" label_selected="儲存" name="WaterSavePreset"/> - <button label="刪除" label_selected="刪除" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="設定" name="Settings"> - <text name="BHText"> - Water Fog Color - </text> - <color_swatch name="WaterFogColor" tool_tip="點擊以開啟顏色挑選器"/> - <text name="WaterFogDensText"> - Fog Density Exponent - </text> - <text name="WaterUnderWaterFogModText"> - Underwater Fog Modifier - </text> - <text name="BDensText"> - Reflection Wavelet Scale - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - Fresnel Scale - </text> - <text name="FresnelOffsetText"> - Fresnel Offset - </text> - <text name="DensMultText"> - Refract Scale Above - </text> - <text name="WaterScaleBelowText"> - Refract Scale Below - </text> - <text name="MaxAltText"> - Blur Multiplier - </text> - </panel> - <panel label="圖像" name="Waves"> - <text name="BHText"> - Big Wave Direction - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Little Wave Direction - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - 正常地圖 - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml deleted file mode 100644 index fce851cc90..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml +++ /dev/null @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="進階天空編輯器"> - <floater.string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </floater.string> - <text name="KeyFramePresetsText"> - Sky Presets: - </text> - <button label="新增" label_selected="新增" name="WLNewPreset"/> - <button label="儲存" label_selected="儲存" name="WLSavePreset"/> - <button label="刪除" label_selected="刪除" name="WLDeletePreset"/> - <button label="Day Cycle Editor" label_selected="Day Cycle Editor" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSPHERE" name="Atmosphere"> - <text name="BHText"> - Blue Horizon - </text> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Haze Horizon - </text> - <text name="BDensText2"> - Blue Density - </text> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Haze Density - </text> - <text name="DensMultText"> - Density Multiplier - </text> - <text name="WLDistanceMultText"> - Distance Multiplier - </text> - <text name="MaxAltText"> - Max Altitude - </text> - </panel> - <panel label="LIGHTING" name="Lighting"> - <text name="SLCText"> - Sun/Moon Color - </text> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Sun/Moon Position - </text> - <text name="WLAmbientText"> - Ambient - </text> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - East Angle - </text> - <text name="SunGlowText"> - Sun Glow - </text> - <slider label="Focus" name="WLGlowB"/> - <slider label="尺寸" name="WLGlowR"/> - <text name="SceneGammaText"> - Scene Gamma - </text> - <text name="WLStarText"> - Star Brightness - </text> - </panel> - <panel label="CLOUDS" name="Clouds"> - <text name="WLCloudColorText"> - Cloud Color - </text> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Cloud XY/Density - </text> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Cloud Coverage - </text> - <text name="WLCloudScaleText"> - Cloud Scale - </text> - <text name="WLCloudDetailText"> - Cloud Detail (XY/Density) - </text> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Cloud Scroll X - </text> - <check_box label="Lock" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Cloud Scroll Y - </text> - <check_box label="Lock" name="WLCloudLockY"/> - <check_box label="Draw Classic Clouds" name="DrawClassicClouds"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml index 6ac7226185..a624877ab3 100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="儲存精選地點" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="取消" name="cancel_btn"/> </layout_panel> </layout_stack> |
