From 02a1b5ea083ffd2b56d90a17d29a5bfc864889bb Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Tue, 1 Sep 2009 18:40:07 +0000
Subject: [PATCH] DEV-39252 fix duplicate name= elements in the EN xui. This
breaks localization, please dont do it.
---
.../skins/default/xui/en/floater_preview_gesture.xml | 10 +++++-----
.../default/xui/en/panel_preferences_advanced.xml | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 90711e3accf..0f6504c8751 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -76,7 +76,7 @@
height="40"
layout="topleft"
left_delta="84"
- name="desc"
+ name="desc2"
top_delta="-4"
width="180" />
@@ -116,17 +116,17 @@
<panel
class="floater_snapshot_capture"
filename="floater_snapshot_Info.xml"
- name="snapshot_capture_tab"/>
+ name="snapshot_capture_panel"/>
</accordion_tab>
<accordion_tab
min_height="100"
title="Permissions"
- name="snapshot_capture_tab"
+ name="snapshot_capture_tab2"
can_resize="false">
<panel
class="floater_snapshot_capture"
filename="floater_snapshot_Permissions.xml"
- name="snapshot_capture_tab"/>
+ name="snapshot_capture_panel2"/>
</accordion_tab>
</accordion>
<!--check_box
@@ -164,7 +164,7 @@
label="Cancel (not working)"
layout="topleft"
left_pad="5"
- name="save_btn"
+ name="cancel_btn"
top_delta="0"
width="80" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 060d84b2e48..88bf3d3b229 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -120,7 +120,7 @@
height="10"
left="30"
text_color="EmphasisColor"
- name="text_box1"
+ name="heading1"
top_pad="30"
width="270">
Camera:
@@ -166,7 +166,7 @@ Camera:
length="1"
height="10"
left="30"
- name="text_box1"
+ name="heading2"
width="270">
Automatic positioning for:
</text>
@@ -194,7 +194,7 @@ Automatic positioning for:
height="10"
left="30"
text_color="EmphasisColor"
- name="text_box1"
+ name="heading3"
top_pad="30"
width="270">
My Avatar:
--
GitLab