diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-11 20:06:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-11 20:06:05 -0400 |
| commit | 5ffde6fa6dd94bc717971ccece3e22bec974ca60 (patch) | |
| tree | 78b8a1912f19ad6b6f21d983d061266b3cb27ffe | |
| parent | 09bdefabc6a1eaf1b9c33e411966c241e2792920 (diff) | |
| parent | 86180db1f1f3f9c86e1a69f278af95ae05ca1156 (diff) | |
merge changes for storm-1236
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_snapshot.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 09fca27f43..7e9960e594 100644 --- 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 diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 857932e51a..e413228ddc 100644 --- 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 |