From aa341e918e925aefd3481bb132896f3b0a980dba Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 7 Oct 2011 11:28:37 -0400
Subject: [PATCH] Duplicated XUI ID: floater_model_wizard.xml
---
doc/contributions.txt | 1 +
indra/newview/skins/default/xui/en/floater_model_wizard.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcdc5a63d21..f8f802548ab 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 b5a5ff53424..9c0af7d9ba5 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>
--
GitLab