summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-01-21 15:32:43 +0000
committerAimee Linden <aimee@lindenlab.com>2010-01-21 15:32:43 +0000
commitbf1219eb59a9dbaebd3e2052963ded76bfcb0b21 (patch)
tree863a4c03c8d6a2d0a8eb390481cb1d9df706a397 /indra/newview/skins
parent5ca943cd0279d35ffdf584fa0de3b795645f276c (diff)
Fix for bug EXT-4421 (Parcel Voice settings not respected)
Turns out the UI controls weren't hooked up to anything and so not showing that the parcel was actually voice enabled. Fixed by restoring the same functionality for these controls as in previous viewers, i.e. they now reflect the state of the current parcel, but are disabled when voice is disabled on the region. Reviewed by Lynx.
Diffstat (limited to 'indra/newview/skins')
-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