aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelinput.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llpanelinput.cpp')
-rw-r--r--linden/indra/newview/llpanelinput.cpp6
1 files changed, 4 insertions, 2 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()
79 childSetValue("double_click_action", gSavedSettings.getString("DoubleClickAction")); 79 childSetValue("double_click_action", gSavedSettings.getString("DoubleClickAction"));
80 childSetCommitCallback("double_click_action", onCommitAction, this); 80 childSetCommitCallback("double_click_action", onCommitAction, this);
81 childSetValue("go_action", gSavedSettings.getString("GoAction")); 81 childSetValue("go_action", gSavedSettings.getString("GoAction"));
82 childSetEnabled("go_action_label", gSavedSettings.getString("DoubleClickAction") == "Go");
83 childSetEnabled("go_action", gSavedSettings.getString("DoubleClickAction") == "Go");
82 84
83 childSetValue("Disable camera constraints", gSavedSettings.getBOOL("DisableCameraConstraints")); 85 childSetValue("Disable camera constraints", gSavedSettings.getBOOL("DisableCameraConstraints"));
84 childSetValue("disable_min_zoom_check", gSavedSettings.getBOOL("DisableMinZoomDist")); 86 childSetValue("disable_min_zoom_check", gSavedSettings.getBOOL("DisableMinZoomDist"));
@@ -139,7 +141,7 @@ void LLPanelInput::onCommitAction(LLUICtrl* ctrl, void* user_data)
139 LLComboBox* combo = (LLComboBox*)ctrl; 141 LLComboBox* combo = (LLComboBox*)ctrl;
140 if (self && combo) 142 if (self && combo)
141 { 143 {
142 self->childSetEnabled("go_action_label", combo->getSimple() == "Go"); 144 self->childSetEnabled("go_action_label", combo->getValue().asString() == "Go");
143 self->childSetEnabled("go_action", combo->getSimple() == "Go"); 145 self->childSetEnabled("go_action", combo->getValue().asString() == "Go");
144 } 146 }
145} 147}