1 files changed, 23 insertions, 3 deletions

diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 70e975e..571bcac 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1430,11 +1430,21 @@ void LLPanelEstateInfo::addAllowedGroup(S32 option, void* user_data)
 {
         if (option != 0) return;
 
-        LLFloaterGroups* widget;
-        widget = LLFloaterGroups::show(gAgent.getID(), LLFloaterGroups::CHOOSE_ONE);
+        LLPanelEstateInfo* panelp = (LLPanelEstateInfo*)user_data;
+
+        LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
+
+        LLFloaterGroupPicker* widget;
+        widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
         if (widget)
         {
-                widget->setOkCallback(addAllowedGroup2, user_data);
+                widget->setSelectCallback(addAllowedGroup2, user_data);
+                if (parent_floater)
+                {
+                        LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, widget);
+                        widget->setOrigin(new_rect.mLeft, new_rect.mBottom);
+                        parent_floater->addDependentFloater(widget);
+                }
         }
 }
 
@@ -1930,6 +1940,7 @@ BOOL LLPanelEstateInfo::postBuild()
         initCtrl("deny_anonymous");
         initCtrl("deny_identified");
         initCtrl("deny_transacted");
+        initCtrl("voice_chat_check");
 
         initHelpBtn("estate_manager_help",                      "HelpEstateEstateManager");
         initHelpBtn("use_global_time_help",                     "HelpEstateUseGlobalTime");
@@ -1939,6 +1950,7 @@ BOOL LLPanelEstateInfo::postBuild()
         initHelpBtn("allow_resident_help",                      "HelpEstateAllowResident");
         initHelpBtn("allow_group_help",                         "HelpEstateAllowGroup");
         initHelpBtn("ban_resident_help",                        "HelpEstateBanResident");
+        initHelpBtn("voice_chat_help", "HelpEstateVoiceChat");
 
         // set up the use global time checkbox
         childSetCommitCallback("use_global_time_check", onChangeUseGlobalTime, this);
@@ -2104,6 +2116,9 @@ void LLPanelEstateInfo::setEstateFlags(U32 flags)
 {
         childSetValue("externally_visible_check", LLSD(flags & REGION_FLAGS_EXTERNALLY_VISIBLE ? TRUE : FALSE) );
         childSetValue("fixed_sun_check", LLSD(flags & REGION_FLAGS_SUN_FIXED ? TRUE : FALSE) );
+        childSetValue(
+                "voice_chat_check",
+                LLSD(flags & REGION_FLAGS_ALLOW_VOICE ? TRUE : FALSE));
         childSetValue("allow_direct_teleport", LLSD(flags & REGION_FLAGS_ALLOW_DIRECT_TELEPORT ? TRUE : FALSE) );
         childSetValue("deny_anonymous", LLSD(flags & REGION_FLAGS_DENY_ANONYMOUS ? TRUE : FALSE) );
         childSetValue("deny_identified", LLSD(flags & REGION_FLAGS_DENY_IDENTIFIED ? TRUE : FALSE) );
@@ -2119,6 +2134,11 @@ U32 LLPanelEstateInfo::computeEstateFlags()
         {
                 flags |= REGION_FLAGS_EXTERNALLY_VISIBLE;
         }
+
+        if ( childGetValue("voice_chat_check").asBoolean() )
+        {
+                flags |= REGION_FLAGS_ALLOW_VOICE;
+        }
         
         if (childGetValue("allow_direct_teleport").asBoolean())
         {