summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-24 20:08:31 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-24 20:08:31 -0700
commit7010eb1368f3f7e867b4bd32c0340d6061f8205e (patch)
treed12eca879b888b3796f4fc5ce65339a65b20e671
parent4386bb173b17ca499e0c63809b8c7227da3f0e1c (diff)
parent68e2813b41d676fd6ab5d79e934ac6ff75fb8a5b (diff)
Pull from viewer-beta
-rw-r--r--.hgtags2
-rw-r--r--indra/newview/skins/minimal/xui/en/floater_help_browser.xml10
2 files changed, 7 insertions, 5 deletions
diff --git a/.hgtags b/.hgtags
index 04b353036a..fd247f4519 100644
--- a/.hgtags
+++ b/.hgtags
@@ -82,3 +82,5 @@ f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
9283d6d1d7eb71dfe4c330e7c9144857e7356bde 2.6.0-beta1
9283d6d1d7eb71dfe4c330e7c9144857e7356bde DRTVWR-40_2.6.0-beta1
c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-start
+9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2
+9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2
diff --git a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
index eddfe41c25..cc551f7d58 100644
--- a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
@@ -8,12 +8,12 @@
min_height="360"
left="645"
top="10"
- min_width="300"
+ min_width="345"
name="floater_help_browser"
save_rect="true"
single_instance="true"
title="HOW TO"
- width="300">
+ width="335">
<floater.string
name="loading_text">
Loading...
@@ -29,14 +29,14 @@
orientation="vertical"
name="stack1"
top="20"
- width="290">
+ width="325">
<layout_panel
layout="topleft"
left_delta="0"
top_delta="0"
name="external_controls"
user_resize="false"
- width="280">
+ width="325">
<web_browser
trusted_content="true"
bottom="-5"
@@ -46,7 +46,7 @@
name="browser"
top="0"
height="300"
- width="280" />
+ width="325" />
</layout_panel>
</layout_stack>
</floater>