1 files changed, 27 insertions, 0 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 4ae093e..3c4af02 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -96,6 +96,22 @@ BOOL LLPrefsAdvanced::postBuild()
         LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
         crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
 
+        childSetCommitCallback("EmeraldCmdLinePos", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineGround", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineHeight", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineTeleportHome", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineRezPlatform", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineMapTo", onCommitApplyControl);    
+        childSetCommitCallback("EmeraldCmdLineCalc", onCommitApplyControl);
+
+        childSetCommitCallback("EmeraldCmdLineDrawDistance", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdTeleportToCam", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineKeyToName", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineOfferTp", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineTP2", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineAO", onCommitApplyControl);
+        childSetCommitCallback("EmeraldCmdLineClearChat", onCommitApplyControl);
+
         getChild<LLComboBox>("EmeraldSpellBase")->setCommitCallback(onSpellBaseComboBoxCommit);
         getChild<LLButton>("EmSpell_EditCustom")->setClickedCallback(onSpellEditCustom, this);
         getChild<LLButton>("EmSpell_GetMore")->setClickedCallback(onSpellGetMore, this);
@@ -273,6 +289,17 @@ bool LLPrefsAdvanced::callbackReset(const LLSD& notification, const LLSD& respon
         return false;
 }
 
+//workaround for lineeditor dumbness in regards to control_name
+void LLPrefsAdvanced::onCommitApplyControl(LLUICtrl* caller, void* user_data)
+{
+        LLLineEditor* line = (LLLineEditor*)caller;
+        if(line)
+        {
+                LLControlVariable *var = line->findControl(line->getControlName());
+                if(var)var->setValue(line->getValue());
+        }
+}
+
 void LLPrefsAdvanced::onSpellAdd(void* data)
 {
         LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;