From 5662a8d126b3dab1100aab014aeaeb1752dba26a Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 10 Nov 2009 12:07:42 +0800
Subject: [PATCH] DEV-35097 final check in XUI for instances of the nonapproved
terms "2nd Life", "1st Life", "SLURL"
---
.../newview/skins/default/xui/en/floater_preview_texture.xml | 4 ++--
.../skins/default/xui/en/menu_places_gear_landmark.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index e7abfb075af..52a19ac6b3d 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -109,10 +109,10 @@
<combo_item name="Unconstrained" value="Unconstrained">
Unconstrained
</combo_item>
- <combo_item name="1:1" value="1:1" tool_tip="Group insignia or 1st Life profile">
+ <combo_item name="1:1" value="1:1" tool_tip="Group insignia or Real World profile">
1:1
</combo_item>
- <combo_item name="4:3" value="4:3" tool_tip="2nd Life profile">
+ <combo_item name="4:3" value="4:3" tool_tip="[SECOND_LIFE] profile">
4:3
</combo_item>
<combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks">
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
index 63d1a67d0f1..4b8bc8132fc 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
@@ -82,7 +82,7 @@
parameter="copy" />
</menu_item_call>
<menu_item_call
- label="Copy SLURL"
+ label="Copy SLurl"
layout="topleft"
name="copy_slurl">
<on_click
--
GitLab