summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-12-04 18:19:47 +0000
committerCho <cho@lindenlab.com>2013-12-04 18:19:47 +0000
commitb6d02ae9c84e185f2507323c47c0475ce43f9e7a (patch)
tree1b283e5f807b64b8f7f8a46a63d1c5a964051095 /indra/newview/skins/default/xui/en
parentffff7ef59f43c66f966f259cb30e069a2445aa66 (diff)
Added SLURL checkbox to floater_twitter for ACME-1216
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_twitter.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_twitter_photo.xml14
2 files changed, 14 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_twitter.xml b/indra/newview/skins/default/xui/en/floater_twitter.xml
index 7007a14cdb..751914141c 100644
--- a/indra/newview/skins/default/xui/en/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/en/floater_twitter.xml
@@ -10,10 +10,10 @@
single_instance="true"
reuse_instance="true"
title="TWITTER"
- height="482"
+ height="502"
width="304">
<panel
- height="482"
+ height="502"
width="304"
visible="true"
name="background"
@@ -27,7 +27,7 @@
tab_height="30"
tab_position="top"
top="7"
- height="437"
+ height="457"
halign="center">
<panel
filename="panel_twitter_photo.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index 8e2412c84e..3ddec9b989 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -1,19 +1,19 @@
<panel
- height="400"
+ height="420"
width="304"
layout="topleft"
name="panel_twitter_photo">
<layout_stack
layout="topleft"
border_size="0"
- height="392"
+ height="412"
follows="all"
orientation="vertical"
name="stack_photo"
top="8">
<layout_panel
name="text_panel"
- height="140">
+ height="160">
<text
length="1"
follows="top|left|right"
@@ -39,6 +39,14 @@
<check_box
follows="left|top"
initial_value="true"
+ label="Include SL location"
+ name="add_location_cb"
+ left="9"
+ height="16"
+ top_pad="10"/>
+ <check_box
+ follows="left|top"
+ initial_value="true"
label="Include a photo"
name="add_photo_cb"
left="9"