diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-21 06:48:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-21 06:48:24 -0400 |
| commit | 255eebf11615a1a8c47003ee24b1696b8ae63e23 (patch) | |
| tree | 5a9f7b2efdb969444093cf39cea1ba9d87eaa955 | |
| parent | 897dc39578f45aea19e9086e47dbbeb0b6893bab (diff) | |
| parent | aa341e918e925aefd3481bb132896f3b0a980dba (diff) | |
merge changes for storm-1638
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_model_wizard.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 7a914fe3f7..988410701b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -576,6 +576,7 @@ Jonathan Yap STORM-1572 STORM-1574 STORM-1579 + STORM-1638 STORM-976 STORM-1639 STORM-910 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> |