From 2a8933ddc0aacdfd324afe293cf4a04744a1362c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 1 Jul 2011 02:16:21 -0700
Subject: Fixed #994: double click action combobox not enabling

---
 linden/indra/newview/llpanelinput.cpp                               | 6 ++++--
 .../newview/skins/default/xui/en-us/panel_preferences_input.xml     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 9664b6f..538f706 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -79,6 +79,8 @@ BOOL LLPanelInput::postBuild()
 	childSetValue("double_click_action", gSavedSettings.getString("DoubleClickAction"));
 	childSetCommitCallback("double_click_action", onCommitAction, this);
 	childSetValue("go_action", gSavedSettings.getString("GoAction"));
+	childSetEnabled("go_action_label", gSavedSettings.getString("DoubleClickAction") == "Go");
+	childSetEnabled("go_action", gSavedSettings.getString("DoubleClickAction") == "Go");
 
 	childSetValue("Disable camera constraints", gSavedSettings.getBOOL("DisableCameraConstraints"));
 	childSetValue("disable_min_zoom_check", gSavedSettings.getBOOL("DisableMinZoomDist"));
@@ -139,7 +141,7 @@ void LLPanelInput::onCommitAction(LLUICtrl* ctrl, void* user_data)
 	LLComboBox* combo = (LLComboBox*)ctrl;
 	if (self && combo)
 	{
-		self->childSetEnabled("go_action_label", combo->getSimple() == "Go");
-		self->childSetEnabled("go_action", combo->getSimple() == "Go");
+		self->childSetEnabled("go_action_label", combo->getValue().asString() == "Go");
+		self->childSetEnabled("go_action", combo->getValue().asString() == "Go");
 	}
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 5713933..9f3c5c4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -25,7 +25,7 @@ USE left="270" FOR TABBING OPTIONS
     Double-Click Action:
   </text>
 
-  <combo_box name="double_click_action"
+  <combo_box name="double_click_action" enabled="true" 
              bottom_delta="-25" left_delta="30" height="18" width="160"
              follows="left|top" mouse_opaque="true">
     <combo_item name="None" value="None">
-- 
cgit v1.1