From bf1219eb59a9dbaebd3e2052963ded76bfcb0b21 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 21 Jan 2010 15:32:43 +0000
Subject: 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.
---
 indra/newview/skins/default/xui/en/floater_about_land.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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
-- 
cgit v1.2.3