Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • alchemy-archive/alchemy
  • Liru/alchemy
  • TesticularSlingshot/alchemy
3 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 293 additions and 254 deletions
indra/newview/skins/default/textures/logos/fmod_white.png 0 → 100644
View file @ 655d119b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
indra/newview/skins/default/textures/textures.xml
View file @ 655d119b
......@@ -148,7 +148,6 @@ with the same filename but different name
<texture name="Command_MiniCart_Icon" file_name="toolbar_icons/mini_cart.png" preload="true" />
<texture name="Command_MiniMap_Icon" file_name="toolbar_icons/mini_map.png" preload="true" />
<texture name="Command_Move_Icon" file_name="toolbar_icons/move.png" preload="true" />
<texture name="Command_Outbox_Icon" file_name="toolbar_icons/outbox.png" preload="true" />
<texture name="Command_Panic_Icon" file_name="toolbar_icons/panic.png" preload="true" />
<texture name="Command_People_Icon" file_name="toolbar_icons/people.png" preload="true" />
<texture name="Command_Picks_Icon" file_name="toolbar_icons/picks.png" preload="true" />
......@@ -841,4 +840,5 @@ with the same filename but different name
<texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
<texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png" preload="true"/>
<texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png" preload="true"/>
<texture name="FMOD_White" file_name="logos/fmod_white.png" preload="true"/>
</textures>
indra/newview/skins/default/xui/de/floater_about_land.xml
View file @ 655d119b
......@@ -30,7 +30,7 @@
<floater.string name="Always">
Immer
</floater.string>
<tab_container name="landtab" tab_min_width="40" width="489">
<tab_container name="landtab" tab_min_width="40">
<panel label="ALLGEMEIN" name="land_general_panel">
<panel.string name="new users only">
Nur neue Benutzer
......
indra/newview/skins/default/xui/de/floater_merchant_outbox.xml deleted 100644 → 0
View file @ 5b1ec3c9
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_merchant_outbox" title="HÄNDLER-OUTBOX">
<string name="OutboxFolderCount1">
1 Ordner
</string>
<string name="OutboxFolderCountN">
[NUM] Ordner
</string>
<string name="OutboxImporting">
Ordner übertragen...
</string>
<string name="OutboxInitializing">
Initialisieren...
</string>
<panel label="" name="panel_1">
<panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Laden...
</text>
</panel>
</panel>
<panel name="panel_3">
<panel name="outbox_generic_drag_target">
<text name="text_1">
Artikel hierher ziehen, um Ordner zu erstellen
</text>
</panel>
<button label="In Marktplatz übertragen" name="outbox_import_btn" tool_tip="In meinen Marktplatz-Laden verschieben"/>
</panel>
</panel>
</floater>
indra/newview/skins/default/xui/de/panel_outbox_inventory.xml deleted 100644 → 0
View file @ 5b1ec3c9
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<outbox_inventory_panel name="inventory_outbox" tool_tip="Legen Sie Artikel hier ab, um sie zum Verkauf in Ihrem Laden vorzubereiten"/>
indra/newview/skins/default/xui/de/panel_preferences_chat.xml
View file @ 655d119b
......@@ -13,7 +13,7 @@
<item label="Mittel" name="Medium" value="1"/>
<item label="Groß" name="Large" value="2"/>
</combo_box>
<check_box label="Blasen-Chat" name="bubble_text_chat"/>
<check_box label="Blasen-Chat" name="bubble_text_chat" left_delta="8"/>
</panel>
<panel name="im_notification_settings">
<text name="friend_ims">
......
indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
View file @ 655d119b
......@@ -3,10 +3,10 @@
<text name="preset_text">
(Keine)
</text>
<text name="QualitySpeed">
<text name="QualitySpeed" top_delta="20">
Qualität und Geschwindigkeit:
</text>
<text name="ShadersPrefText">
<text name="ShadersPrefText" top_delta="15">
Niedrig
</text>
<text name="ShadersPrefText2">
......
indra/newview/skins/default/xui/en/floater_about.xml
View file @ 655d119b
......@@ -45,38 +45,6 @@ RestrainedLove API: [RLV_VERSION]
height="25"
width="180" />
</panel>
<panel
border="true"
label="Credits"
help_topic="about_credits_tab"
name="credits_panel">
<text
follows="top|left|right"
height="20"
layout="topleft"
left="5"
name="linden_intro"
top="10"
width="465"
wrap="true">
Second Life is brought to you by the Lindens,
with open source contributions from:
</text>
<text_editor
enabled="false"
follows="top|left"
height="340"
bg_readonly_color="Transparent"
left="5"
text_color="LtGray"
max_length="65536"
name="contrib_names"
top_pad="10"
width="465"
word_wrap="true">
Dummy Name replaced at run time
</text_editor>
</panel>
<panel
border="true"
label="Licenses"
......@@ -124,6 +92,38 @@ All rights reserved. See licenses.txt for details.
Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
</text_editor>
</panel>
<panel
border="true"
label="Linden Credits"
help_topic="about_credits_tab"
name="credits_panel">
<text
follows="top|left|right"
height="20"
layout="topleft"
left="5"
name="linden_intro"
top="10"
width="465"
wrap="true">
Second Life is brought to you by the Lindens,
with open source contributions from:
</text>
<text_editor
enabled="false"
follows="top|left"
height="340"
bg_readonly_color="Transparent"
left="5"
text_color="LtGray"
max_length="65536"
name="contrib_names"
top_pad="10"
width="465"
word_wrap="true">
Dummy Name replaced at run time
</text_editor>
</panel>
<panel
border="true"
label="Alchemy Credits"
......@@ -151,8 +151,8 @@ Alchemy Viewer is brought to you by the Alchemy Development Group:
top_pad="10"
width="435"
word_wrap="true">
Sovereign Engineer, Cinder Roxley, Inusaito Kanya, Luminous Luminos, Electron Electricteeth
</text_editor>
Sovereign Engineer, Luminous Luminos, Cinder Roxley, Inusaito Kanya
</text_editor>
<text
follows="top|left"
height="10"
......@@ -175,7 +175,7 @@ with open source code from:
top_pad="12"
width="435"
word_wrap="true">
Siana Gearz, Shyotl Kuhr, Xenhat Liamano, NiranV Dean, Qarl Fizz, TheDarkest Fairey, Tofu Buzzard, Ansariel Hiller, Kitty Barnett, Ayamo Nozaki
Siana Gearz, Shyotl Kuhr, Xenhat Liamano, NiranV Dean, Qarl Fizz, TheDarkest Fairey, Tofu Buzzard, Ansariel Hiller, Kitty Barnett, Ayamo Nozaki, Nicky Dasmijn, Testicular Slingshot, Electron Electricteeth, Latif Khalifa
</text_editor>
<text
follows="top|left"
......@@ -198,8 +198,9 @@ and project infrastructure from:
top_pad="12"
width="435"
word_wrap="true">
Atlassian: Bitbucket, Confluence, Jira, Bamboo
Coverity: Coverity Scan
[https://about.gitlab.com/ GitLab] - The best DevOps platform!
[https://sentry.io/welcome/ Sentry] - Our wonderful crash reporting service provider!
[https://scan.coverity.com/ Coverity] - It helps us fix bugs and find crashes
</text_editor>
</panel>
</tab_container>
......
indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
View file @ 655d119b
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="190"
height="180"
layout="topleft"
name="Anim Preview"
help_topic="animation_anim_preview"
......@@ -60,9 +60,9 @@
height="22"
label="Upload (L$[AMOUNT])"
layout="topleft"
left="45"
left="35"
name="ok_btn"
top_pad="60"
top_pad="15"
width="150" />
<button
follows="right|bottom"
......@@ -73,4 +73,17 @@
name="cancel_btn"
left_pad="5"
width="90" />
<text
type="string"
length="1"
follows="left|top"
height="35"
layout="topleft"
left="10"
mouse_opaque="false"
skip_link_underline="true"
name="info_text"
word_wrap="true"
top_pad="10"
width="270"/>
</floater>
indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
View file @ 655d119b
......@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
can_minimize="false"
height="610"
height="645"
layout="topleft"
name="Animation Preview"
help_topic="animation_preview"
......@@ -570,4 +570,17 @@ We recommend BVH files exported from Poser 4.
name="cancel_btn"
left="142"
width="128" />
<text
type="string"
length="1"
follows="left|top"
height="35"
layout="topleft"
left="10"
mouse_opaque="false"
skip_link_underline="true"
name="info_text"
word_wrap="true"
top_pad="10"
width="270"/>
</floater>
indra/newview/skins/default/xui/en/floater_avatar_textures.xml
View file @ 655d119b
......@@ -28,11 +28,13 @@
name="scroll_content_panel"
follows="left|top"
min_height="300"
min_width="300"
layout="topleft"
top="0"
background_visible="false"
left="0"
height="680">
height="1165"
width="1015">
<text
type="string"
length="1"
......@@ -102,6 +104,14 @@ Textures
name="hair_alpha"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Hair Tattoo"
layout="topleft"
left_pad="7"
name="hair_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
......@@ -135,6 +145,14 @@ Textures
name="head_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Head Unv Tattoo"
layout="topleft"
left_pad="7"
name="head_universal_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
......@@ -160,6 +178,14 @@ Textures
name="eyes_alpha"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Eyes Tattoo"
layout="topleft"
left_pad="7"
name="eyes_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
......@@ -225,6 +251,14 @@ Textures
name="upper_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Upper Unv Tattoo"
layout="topleft"
left_pad="7"
name="upper_universal_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
......@@ -298,6 +332,14 @@ Textures
name="lower_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Lower Unv Tattoo"
layout="topleft"
left_pad="7"
name="lower_universal_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
......@@ -315,6 +357,99 @@ Textures
name="skirt"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Skirt Tattoo"
layout="topleft"
left_pad="7"
name="skirt_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Left Arm"
layout="topleft"
left="10"
name="leftarm-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="Left Arm Tattoo"
layout="topleft"
left_pad="21"
name="leftarm_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Left Leg"
layout="topleft"
left="10"
name="leftleg-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="Left Leg Tattoo"
layout="topleft"
left_pad="21"
name="leftleg_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="AUX 1"
layout="topleft"
left="10"
name="aux1-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="AUX 1 Tattoo"
layout="topleft"
left_pad="21"
name="aux1_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="AUX 2"
layout="topleft"
left="10"
name="aux2-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="AUX 2 Tattoo"
layout="topleft"
left_pad="21"
name="aux2_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="AUX 3"
layout="topleft"
left="10"
name="aux3-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="AUX 3 Tattoo"
layout="topleft"
left_pad="21"
name="aux3_tattoo"
top_delta="0"
width="92" />
</panel>
</panel>
</scroll_container>
......
indra/newview/skins/default/xui/en/floater_forget_user.xml 0 → 100644
View file @ 655d119b
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="258"
layout="topleft"
name="groups"
help_topic="forget_username"
title="REMEMBERED USERNAMES"
width="280">
<scroll_list
height="173"
layout="topleft"
left="12"
name="user_list"
top="24"
width="256">
<scroll_list.columns
name="user"
width="248" />
</scroll_list>
<button
height="20"
label="Forget"
label_selected="Forget"
layout="topleft"
left_delta="90"
name="forget"
top_pad="8"
width="80" />
<check_box
height="20"
label="Also delete local data for this username"
layout="topleft"
left="15"
name="delete_data"
top_pad="5"
width="260"
tool_tip="Deletes local files: chat history, last session screenshot, browser cookies, teleport history, toolbar settings, e t c. Some of local files are shared between grids."/>
</floater>
indra/newview/skins/default/xui/en/floater_image_preview.xml
View file @ 655d119b
......@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
can_minimize="false"
height="460"
height="495"
layout="topleft"
name="Image Preview"
help_topic="image_preview"
......@@ -148,4 +148,17 @@ Try saving image as 24 bit Targa (.tga).
name="ok_btn"
top_delta="0"
width="125" />
<text
type="string"
length="1"
follows="left|top"
height="35"
layout="topleft"
left="10"
mouse_opaque="false"
skip_link_underline="true"
name="info_text"
word_wrap="true"
top_pad="10"
width="270"/>
</floater>
indra/newview/skins/default/xui/en/floater_merchant_outbox.xml deleted 100644 → 0
View file @ 5b1ec3c9
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<floater
positioning="cascading"
can_close="true"
can_resize="true"
height="440"
help_topic="floater_merchant_outbox"
min_width="300"
min_height="200"
name="floater_merchant_outbox"
save_rect="true"
save_visibility="false"
reuse_instance="true"
title="MERCHANT OUTBOX"
width="333">
<string name="OutboxFolderCount0"></string>
<string name="OutboxFolderCount1">1 folder</string>
<string name="OutboxFolderCountN">[NUM] folders</string>
<string name="OutboxImporting">Sending folders...</string>
<string name="OutboxInitializing">Initializing...</string>
<panel
name="panel_1"
follows="all"
layout="topleft"
left="0"
top="0"
label=""
height="440"
width="333">
<panel
name="panel_2"
follows="all"
left="10"
bottom="370"
width="313"
top="0"
bg_opaque_color="InventoryBackgroundColor">
<panel
name="outbox_inventory_placeholder_panel"
follows="all"
layout="topleft"
top="0"
left="0"
width="308"
height="370"
bg_opaque_color="InventoryBackgroundColor">
<text
name="outbox_inventory_placeholder_title"
type="string"
follows="top|left|right"
layout="topleft"
top="10"
left="0"
width="308"
height="25"
wrap="true"
halign="center"
font="SansSerifBold">
Loading...
</text>
<text
name="outbox_inventory_placeholder_text"
type="string"
follows="top|left|right"
layout="topleft"
top="35"
left="0"
width="308"
height="130"
wrap="true"
halign="left" />
</panel>
</panel>
<panel
name="panel_3"
follows="bottom|left|right"
left="10"
bottom="435"
width="313"
top="370">
<panel
name="outbox_generic_drag_target"
mouse_opaque="false"
follows="all"
top="5"
left="5"
width="303"
height="25"
background_visible="false"
bg_alpha_color="EmphasisColor_35"
border="true"
bevel_style="in"
visible="true">
<text
name="text_1"
type="string"
follows="all"
layout="topleft"
top="6"
height="20"
left="5"
width="293"
halign="center"
font="SansSerifMedium"
font_shadow="hard"
valign="top">
Drag items here to create folders
</text>
</panel>
<text
name="outbox_folder_count"
type="string"
follows="all"
layout="topleft"
top="40"
left="5"
width="150"
height="20"
wrap="true"
halign="left"
valign="center"
font="SansSerif"/>
<button
label="Send to Marketplace"
tool_tip="Push to my Marketplace Storefront"
is_toggle="false"
name="outbox_import_btn"
follows="bottom|right"
tab_stop="false"
halign="center"
top="37"
left="160"
height="25"
width="150"
enabled="false" />
</panel>
<layout_stack name="import_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
<layout_panel />
<layout_panel height="24" auto_resize="false">
<layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">
<layout_panel width="0" />
<layout_panel width="24" auto_resize="false">
<loading_indicator
height="24"
layout="topleft"
left="0"
top="0"
width="24" />
</layout_panel>
<layout_panel width="0" />
</layout_stack>
</layout_panel>
<layout_panel />
</layout_stack>
</panel>
</floater>
indra/newview/skins/default/xui/en/floater_preview_trash.xml
View file @ 655d119b
......@@ -14,7 +14,7 @@
reuse_instance="true"
can_minimize="false">
<inventory_panel
name="inventory_outbox"
name="inventory_trash"
start_folder.name="Trash"
show_empty_message="false"
start_folder.type="trash"
......
indra/newview/skins/default/xui/en/floater_region_tracker.xml
View file @ 655d119b
......@@ -65,7 +65,8 @@
multi_select="true"
draw_heading="true"
column_padding="0"
search_column="0">
search_column="0"
sort_column="0">
<scroll_list.columns
name="region_label"
label="Label"
......
indra/newview/skins/default/xui/en/floater_rlv_locks.xml
View file @ 655d119b
......@@ -15,7 +15,6 @@
title="ACTIVE RLV LOCKS"
width="500">
<panel
class="panel_rlvLocks"
filename="panel_rlv_locks.xml"
layout="topleft"
left="9"
......
indra/newview/skins/default/xui/en/floater_sound_preview.xml
View file @ 655d119b
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="190"
height="180"
layout="topleft"
name="Sound Preview"
help_topic="sound_preview"
......@@ -60,9 +60,9 @@
height="22"
label="Upload (L$[AMOUNT])"
layout="topleft"
left="45"
left="35"
name="ok_btn"
top_pad="60"
top_pad="15"
width="150" />
<button
follows="right|bottom"
......@@ -73,4 +73,17 @@
name="cancel_btn"
left_pad="5"
width="90" />
<text
type="string"
length="1"
follows="left|top"
height="35"
layout="topleft"
left="10"
mouse_opaque="false"
skip_link_underline="true"
name="info_text"
word_wrap="true"
top_pad="10"
width="270"/>
</floater>
indra/newview/skins/default/xui/en/floater_tos.xml
View file @ 655d119b
......@@ -3,7 +3,7 @@
legacy_header_height="18"
can_close="false"
can_minimize="false"
height="500"
height="492"
layout="topleft"
name="modal container"
width="600">
......@@ -20,14 +20,14 @@
length="1"
follows="left|top"
font="SansSerif"
height="45"
height="55"
layout="topleft"
left="20"
name="tos_heading"
top="20"
word_wrap="true"
width="552">
Please read the following Second Life Terms and Conditions, Privacy Policy, and Terms of Service, including the requirements for the use of arbitration and the waiver of any class or group claim to resolve disputes. To continue logging in to [SECOND_LIFE], you must accept these agreements.
Please read the following Terms and Conditions, Privacy Policy, and Terms of Service, including the requirements for the use of arbitration and the waiver of any class or group claim to resolve disputes. To continue logging in you must accept these agreements.
</text>
<text
type="string"
......@@ -51,7 +51,7 @@
layout="topleft"
left_delta="0"
name="tos_html"
top_delta="70"
top_delta="75"
width="568" />
<check_box
follows="top|left"
......@@ -72,11 +72,11 @@
layout="topleft"
left_delta="28"
name="agree_list"
top_delta="0"
top_delta="-4"
word_wrap="true"
text_readonly_color="LabelDisabledColor"
width="552">
I have read and agree to the Second Life Terms and Conditions, Privacy Policy, and Terms of Service, including the dispute resolution requirements.
I have read and agree to the Terms and Conditions, Privacy Policy, and Terms of Service, including the dispute resolution requirements.
</text>
<button
enabled="false"
......
indra/newview/skins/default/xui/en/menu_chatbar_gear.xml
View file @ 655d119b
......@@ -8,20 +8,22 @@
label="Close chat bar on return"
name="CloseChatBarOnReturn">
<menu_item_check.on_check
control="CloseChatBarOnReturn" />
function="CheckControl"
parameter="CloseChatBarOnReturn" />
<menu_item_check.on_click
function="ToggleControl"
parameter="CloseChatBarOnReturn" />
</menu_item_check>
<menu_item_check
<!-- <menu_item_check
label="Letter keys open chat"
name="LetterKeysFocusChatBar">
<menu_item_check.on_check
control="LetterKeysFocusChatBar" />
function="CheckControl"
parameter="LetterKeysFocusChatBar" />
<menu_item_check.on_click
function="ToggleControl"
parameter="LetterKeysFocusChatBar" />
</menu_item_check>
</menu_item_check> -->
<menu_item_separator />
<menu_item_call
label="Shout (Control)"
......