diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:21:00 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:21:00 -0500 |
| commit | 584b615c3444fdeaa0d41f1d9e839edf1518a310 (patch) | |
| tree | d6804649d6cbb948ce18077c3c25c14a329a16bf | |
| parent | ce46d524accb2621d64c25eed0d2c272b80ce54d (diff) | |
| parent | b8e036dff57dd83fbe2069453544050339ff102d (diff) | |
merge changes for storm-1918
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_notices.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3dd76839fd..e465f0441a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -650,6 +650,7 @@ Jonathan Yap STORM-1872 STORM-1858 STORM-1862 + STORM-1918 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 6d5fb51e85..c8ce5cdebf 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -202,14 +202,14 @@ Maximum 200 per group daily Drag and drop item here to attach it: </text> <icon - height="72" + height="48" image_name="DropTarget" layout="topleft" left_pad="10" mouse_opaque="true" name="drop_icon" top_delta="-10" - width="72" /> + width="110" /> <button follows="left|top" layout="topleft" |