From a96ab6cba4bd10141d947860d210c1f452734819 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 2 Sep 2013 23:35:38 +1000
Subject: Fix up OTR prefs to not crash.

No idea how this managed to work before.
---
 linden/indra/newview/floaterotr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/newview/floaterotr.cpp b/linden/indra/newview/floaterotr.cpp
index a655fd7..4c78d4c 100644
--- a/linden/indra/newview/floaterotr.cpp
+++ b/linden/indra/newview/floaterotr.cpp
@@ -54,7 +54,7 @@ BOOL FloaterOTR::postBuild()
 	childSetAction("btn_cancel", onClickCancel, this);
 
 	childSetValue("EmeraldUseOTR", LLSD((S32)gSavedSettings.getU32("EmeraldUseOTR")));
-	childSetValue("EmeraldUseOTRInTypingStop", gSavedSettings.getBOOL("EmeraldUseOTRInTypingStop"));
+	childSetValue("EmeraldOTRInTypingStop", gSavedSettings.getBOOL("EmeraldOTRInTypingStop"));
 	getChild<LLButton>("otr_help_btn")->setClickedCallback(onClickOtrHelp, this);
 
 	return TRUE;
@@ -89,7 +89,7 @@ void FloaterOTR::apply()
     U32 otrpref = childGetValue("EmeraldUseOTR").asReal();
 
     gSavedSettings.setU32("EmeraldUseOTR", otrpref);
-    gSavedSettings.setBOOL("EmeraldUseOTRInTypingStop", childGetValue("EmeraldUseOTRInTypingStop").asBoolean());
+    gSavedSettings.setBOOL("EmeraldOTRInTypingStop", childGetValue("EmeraldOTRInTypingStop").asBoolean());
     // otrpref: 0 == Require OTR, 1 == Request OTR, 2 == Accept OTR, 3 == Decline OTR
     if (3 == otrpref)
 	OTR_Wrapper::stopAll();
-- 
cgit v1.1