diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-22 09:04:42 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-22 09:04:42 +0100 |
| commit | eeba10255bf41dfe50b975ded16a9fe9c30e4025 (patch) | |
| tree | 3f56f1e991aa007bd6a4f1d9784416fcbfb29fd7 /indra/newview/skins/default/xui/en | |
| parent | c73bb0ae17538c0cb509bf6f0945a29c0ffd69dc (diff) | |
| parent | 28d4fe68f8a44924df294473471b47ccb11a2eb1 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_buy_currency_html.xml | 27 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 40 |
2 files changed, 61 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml new file mode 100644 index 0000000000..ab44082070 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="false" + height="240" + layout="topleft" + min_height="240" + min_width="420" + name="floater_buy_currency_html" + help_topic="floater_buy_currency_html" + save_rect="true" + single_instance="true" + title="BUY CURRENCY" + width="422"> + <floater.string + name="buy_currency_url" translate="false"> + http://user.lindenlab.com/~callum/ez/index.php?lang=[LANGUAGE]&sa=[SPECIFIC_AMOUNT]&sum=[SUM]&msg=[MSG]&bal=[BAL] +</floater.string> + <web_browser + bottom="238" + follows="left|right|top|bottom" + layout="topleft" + left="2" + name="browser" + top="18" + width="420" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 68a0db3b89..1881f85e8c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -160,7 +160,7 @@ layout="topleft" left="5" name="CustomGraphics Panel" - top="101" + top="76" width="485"> <text type="string" @@ -343,7 +343,7 @@ top_delta="0" width="128"> m - </text> + </text> <slider control_name="RenderMaxPartCount" decimal_digits="0" @@ -359,6 +359,34 @@ name="MaxParticleCount" top_pad="7" width="303" /> + <slider + control_name="RenderAvatarMaxVisible" + decimal_digits="0" + follows="left|top" + height="16" + increment="2" + initial_value="35" + label="Max. avatar draw distance:" + label_width="185" + layout="topleft" + left_delta="0" + max_val="65" + min_val="1" + name="MaxAvatarDrawDistance" + top_pad="4" + width="290" /> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="291" + name="DrawDistanceMeterText2" + top_delta="0" + width="128"> + m + </text> <slider control_name="RenderGlowResolutionPow" decimal_digits="0" @@ -369,7 +397,7 @@ label="Post process quality:" label_width="185" layout="topleft" - left_delta="0" + left="200" max_val="9" min_val="8" name="RenderPostProcess" @@ -514,7 +542,7 @@ layout="topleft" left="469" name="PostProcessText" - top="328" + top="60" width="128"> Low </text> @@ -599,7 +627,7 @@ layout="topleft" left_delta="-260" name="AvatarRenderingText" - top_pad="8" + top_pad="18" width="128"> Avatar rendering: </text> @@ -645,7 +673,7 @@ left="358" left_pad="-30" name="TerrainDetailText" - top="488" + top="226" width="155"> Terrain detail: </text> |