diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:24:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:24:48 -0400 |
| commit | f603d143392caf8cfd610d567df0c3fbffeecaa4 (patch) | |
| tree | 34fea28d0f2052670d1341ff4a6acc69ddf774a0 | |
| parent | e6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (diff) | |
| parent | cce5dd64e09eb2f0da039c3e6c4c1ebd7b5aafeb (diff) | |
merge changes for storm-1276
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloaterpostcard.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_postcard.xml | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 0368cd1ff0..55a3aaf1f4 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -563,6 +563,7 @@ Jonathan Yap STORM-1313 STORM-899 STORM-1273 + STORM-1276 STORM-1462 STORM-1459 Kadah Coba diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp index dd0b1d999c..3bcbb987f7 100644 --- a/indra/newview/llfloaterpostcard.cpp +++ b/indra/newview/llfloaterpostcard.cpp @@ -137,9 +137,9 @@ void LLFloaterPostcard::draw() // first set the max extents of our preview rect.translate(-rect.mLeft, -rect.mBottom); - rect.mLeft += 280; + rect.mLeft += 320; rect.mRight -= 10; - rect.mTop -= 20; + rect.mTop -= 27; rect.mBottom = rect.mTop - 130; // then fix the aspect ratio diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml index 8da35e9d7f..c756661ffc 100644 --- a/indra/newview/skins/default/xui/en/floater_postcard.xml +++ b/indra/newview/skins/default/xui/en/floater_postcard.xml @@ -7,11 +7,11 @@ height="380" layout="topleft" min_height="380" - min_width="450" + min_width="490" name="Postcard" help_topic="postcard" title="EMAIL SNAPSHOT" - width="450"> + width="490"> <floater.string name="default_subject"> Postcard from [SECOND_LIFE]. @@ -40,7 +40,7 @@ follows="left|top" height="20" layout="topleft" - left_delta="108" + left_delta="148" name="to_form" top_delta="-4" width="150" /> @@ -59,7 +59,7 @@ follows="left|top" height="20" layout="topleft" - left_delta="108" + left_delta="148" name="from_form" top_delta="-4" width="150" /> @@ -78,7 +78,7 @@ follows="left|top" height="20" layout="topleft" - left_delta="108" + left_delta="148" max_length_bytes="100" name="name_form" top_delta="-4" @@ -99,7 +99,7 @@ height="20" label="Type your subject here." layout="topleft" - left_delta="108" + left_delta="148" max_length_bytes="100" name="subject_form" top_delta="-4" |