merge changes for storm-1236

2011-05-11 20:06:05 -04:00 · 2011-05-11 20:06:05 -04:00 · 5ffde6fa6d
parent 09bdefabc6 86180db1f1
commit 5ffde6fa6d
2 changed files with 2 additions and 1 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -431,6 +431,7 @@ Jonathan Yap
 	STORM-1128
 	STORM-956
 	STORM-1095
+	STORM-1236
 Kage Pixel
 	VWR-11
 Ken March
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@ -11,7 +11,7 @@
 save_rect="true"
 save_visibility="true"
 title="SNAPSHOT PREVIEW"
- width="215">
+ width="245">
    <floater.string
     name="unknown">
        unknown