summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-10-07 14:35:54 -0400
committerJonathan Yap <none@none>2011-10-07 14:35:54 -0400
commit0a3628b66db2a89f5ae509c7e8836a51619f0bef (patch)
tree47d8d61d9245d85bb2ccdb38634fe016a3460740
parent5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff)
STORM-1639 Duplicated XUI ID: floater_build_options.xml
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/skins/default/xui/en/floater_build_options.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcdc5a63d2..064b157089 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -575,6 +575,7 @@ Jonathan Yap
STORM-1567
STORM-1572
STORM-1574
+ STORM-1639
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index c247a12e7a..afb7917043 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -37,7 +37,7 @@
layout="topleft"
left="10"
tool_tip="Grid opacity"
- name="grid_opacity_label"
+ name="grid_mode_label"
top_pad="30"
width="123">
Mode