aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/indra/newview/floaterotr.cpp4
1 files 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()
54 childSetAction("btn_cancel", onClickCancel, this); 54 childSetAction("btn_cancel", onClickCancel, this);
55 55
56 childSetValue("EmeraldUseOTR", LLSD((S32)gSavedSettings.getU32("EmeraldUseOTR"))); 56 childSetValue("EmeraldUseOTR", LLSD((S32)gSavedSettings.getU32("EmeraldUseOTR")));
57 childSetValue("EmeraldUseOTRInTypingStop", gSavedSettings.getBOOL("EmeraldUseOTRInTypingStop")); 57 childSetValue("EmeraldOTRInTypingStop", gSavedSettings.getBOOL("EmeraldOTRInTypingStop"));
58 getChild<LLButton>("otr_help_btn")->setClickedCallback(onClickOtrHelp, this); 58 getChild<LLButton>("otr_help_btn")->setClickedCallback(onClickOtrHelp, this);
59 59
60 return TRUE; 60 return TRUE;
@@ -89,7 +89,7 @@ void FloaterOTR::apply()
89 U32 otrpref = childGetValue("EmeraldUseOTR").asReal(); 89 U32 otrpref = childGetValue("EmeraldUseOTR").asReal();
90 90
91 gSavedSettings.setU32("EmeraldUseOTR", otrpref); 91 gSavedSettings.setU32("EmeraldUseOTR", otrpref);
92 gSavedSettings.setBOOL("EmeraldUseOTRInTypingStop", childGetValue("EmeraldUseOTRInTypingStop").asBoolean()); 92 gSavedSettings.setBOOL("EmeraldOTRInTypingStop", childGetValue("EmeraldOTRInTypingStop").asBoolean());
93 // otrpref: 0 == Require OTR, 1 == Request OTR, 2 == Accept OTR, 3 == Decline OTR 93 // otrpref: 0 == Require OTR, 1 == Request OTR, 2 == Accept OTR, 3 == Decline OTR
94 if (3 == otrpref) 94 if (3 == otrpref)
95 OTR_Wrapper::stopAll(); 95 OTR_Wrapper::stopAll();