summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-02-21 15:19:12 -0500
committerOz Linden <oz@lindenlab.com>2012-02-21 15:19:12 -0500
commitf1c8674aa84d72c9e46c8bbf73387dae3f335b59 (patch)
tree527b3a7fdbf4b9ac1f50cdc1d0cd2ff3f1b1884f /indra/newview/skins
parent57fe6f66f873e05456b5581bfb48b32e7a8985aa (diff)
parent93c570b38b9d0ebed930f986e071800d643e1b74 (diff)
merge changes for storm-1809
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3351ffe00f..9efe78d8ec 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -369,6 +369,9 @@ Please try logging in again in a minute.</string>
<string name="anim_yes_happy">Yes (Happy)</string>
<string name="anim_yes_head">Yes</string>
+ <!-- build floater -->
+ <string name="multiple_textures">Multiple</string>
+
<!-- world map -->
<string name="texture_loading">Loading...</string>
<string name="worldmap_offline">Offline</string>