summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-10-07 11:28:37 -0400
committerJonathan Yap <none@none>2011-10-07 11:28:37 -0400
commitaa341e918e925aefd3481bb132896f3b0a980dba (patch)
tree59cabb0ce9c85f8d3b9a69a395256b0a5880670f
parent5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff)
Duplicated XUI ID: floater_model_wizard.xml
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_wizard.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcdc5a63d2..f8f802548a 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -575,6 +575,7 @@ Jonathan Yap
STORM-1567
STORM-1572
STORM-1574
+ STORM-1638
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index b5a5ff5342..9c0af7d9ba 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -199,7 +199,7 @@
height="10"
layout="topleft"
left="10"
- name="Cache location"
+ name="Model types"
width="320">
Second Life supports COLLADA (.dae) files
</text>