summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-24 15:18:16 -0400
committerOz Linden <oz@lindenlab.com>2014-03-24 15:18:16 -0400
commit0908535c46874db78e53b8ff623d804fe5c53811 (patch)
treed2bff4973027a8b4a8274eecf372833c92ae0cc2 /indra/newview/skins/default/xui
parent6908cb20fd9491623aa07b0a82bf94978624ef32 (diff)
parent31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff)
merge changes for 3.7.4-release
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_social_photo.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_social_photo.xml b/indra/newview/skins/default/xui/en/panel_social_photo.xml
index a55613b52a..c79a246d9d 100644
--- a/indra/newview/skins/default/xui/en/panel_social_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_photo.xml
@@ -113,14 +113,6 @@
type="string"
word_wrap="true">
</text_editor>
- <check_box
- follows="left|top"
- initial_value="true"
- label="Include location in posting"
- name="add_location_cb"
- left="9"
- height="16"
- top_pad="8"/>
</layout_panel>
<layout_panel
name="photo_button_panel"