summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-22 16:19:11 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-22 16:19:11 +0200
commitad501d7fab624c7a85a70fb66e3e24667984f880 (patch)
tree2d5fcb404302f849e72db08ebd9664c1825ecc52 /indra/newview/skins/default/xui
parent74429f2ed926362a2ec47d590fc862b55b26f0f8 (diff)
parentbc0ed2a02b42ae485b2f7a08f6ec3a0c1ab85778 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index c58c1f00b9..61ca783d14 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1871,13 +1871,14 @@ Only large parcels can be listed in search.
layout="topleft"
left="110"
name="parcel_enable_voice_channel_is_estate_disabled"
+ top_delta="0"
width="300" />
<check_box
height="16"
label="Restrict Voice to this parcel"
layout="topleft"
left="110"
- name="parcel_enable_voice_channel_parcel"
+ name="parcel_enable_voice_channel_local"
width="300" />
</panel>
<panel