diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-03 23:25:03 -0800 | 
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-03 23:25:03 -0800 | 
| commit | 5cb2d63979f0ff72cb9351dc9aa070b1990a1f9c (patch) | |
| tree | c56a0d9205c675a6c3836f4a9b7e2dcb4ae7782e /indra/newview | |
| parent | 6fb3cf0d3ae490ec46b2b3006960a688ead6d1e6 (diff) | |
| parent | 24c908483cb1fdceeb222129c4f329969779d6ca (diff) | |
STORM-969 : pull into viewer-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about_land.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 | 
2 files changed, 9 insertions, 0 deletions
| diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 04d50929f7..965ac21110 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1408,6 +1408,10 @@ Only large parcels can be listed in search.                   name="item11"                   value="shopping" />                  <combo_box.item +                 label="Rental" +                 name="item13" +                 value="rental" /> +                <combo_box.item                   label="Other"                   name="item12"                   value="other" /> @@ -1465,6 +1469,10 @@ Only large parcels can be listed in search.                   name="item11"                   value="shopping" />                  <combo_box.item +                 label="Rental" +                 name="item13" +                 value="rental" /> +                <combo_box.item                   label="Other"                   name="item12"                   value="other" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 70a40960a1..c0d5f93f83 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2370,6 +2370,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh  	<!--<string name="Shopping">Shopping</string>	-->  	<string name="Stage">Stage</string>  	<string name="Other">Other</string> +	<string name="Rental">Rental</string>  	<string name="Any">Any</string>  	<string name="You">You</string> | 
