diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:01:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:01:28 -0400 |
| commit | 33dcb301662291dc6004dbf4cc14a5002a7b11f2 (patch) | |
| tree | cc31c7aa2153827cfd118c156ffef44c121cbf0e | |
| parent | 7a9fd689bd35b484be728bddac935707d74a4db7 (diff) | |
| parent | 0a3628b66db2a89f5ae509c7e8836a51619f0bef (diff) | |
merge changes for storm-1639
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_build_options.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 7824f7f5cb..e85fc32f18 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -577,6 +577,7 @@ Jonathan Yap STORM-1572 STORM-1574 STORM-1579 + 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 |