aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefsim.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llprefsim.cpp')
-rw-r--r--linden/indra/newview/llprefsim.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index e037ac7..2ee357c 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -36,6 +36,7 @@
36#include "llprefsim.h" 36#include "llprefsim.h"
37 37
38#include "floaterbusy.h" 38#include "floaterbusy.h"
39#include "floaterotr.h"
39#include "llpanel.h" 40#include "llpanel.h"
40#include "llcheckboxctrl.h" 41#include "llcheckboxctrl.h"
41#include "llstring.h" 42#include "llstring.h"
@@ -73,6 +74,7 @@ public:
73 static void onCommitLogging(LLUICtrl* ctrl, void* user_data); 74 static void onCommitLogging(LLUICtrl* ctrl, void* user_data);
74 75
75 static void onClickBusyAdvanced(void* user_data); 76 static void onClickBusyAdvanced(void* user_data);
77 static void onClickOTRAdvanced(void* user_data);
76 78
77 bool mUpdateUserInfo; 79 bool mUpdateUserInfo;
78 std::string mDirectoryVisibility; 80 std::string mDirectoryVisibility;
@@ -118,6 +120,7 @@ BOOL LLPrefsIMImpl::postBuild()
118 childSetCommitCallback("log_instant_messages",onCommitLogging,this); 120 childSetCommitCallback("log_instant_messages",onCommitLogging,this);
119 121
120 childSetAction("busy_adv_btn", onClickBusyAdvanced, this); 122 childSetAction("busy_adv_btn", onClickBusyAdvanced, this);
123 childSetAction("otr_adv_btn", onClickOTRAdvanced, this);
121 124
122 preparePerAccountPrefs(LLStartUp::isLoggedIn()); 125 preparePerAccountPrefs(LLStartUp::isLoggedIn());
123 126
@@ -308,6 +311,13 @@ void LLPrefsIMImpl::onClickBusyAdvanced(void* user_data)
308} 311}
309 312
310// static 313// static
314void LLPrefsIMImpl::onClickOTRAdvanced(void* user_data)
315{
316 FloaterOTR::getInstance()->open();
317 FloaterOTR::getInstance()->center();
318}
319
320// static
311void LLPrefsIMImpl::onClickLogPath(void* user_data) 321void LLPrefsIMImpl::onClickLogPath(void* user_data)
312{ 322{
313 LLPrefsIMImpl* self=(LLPrefsIMImpl*)user_data; 323 LLPrefsIMImpl* self=(LLPrefsIMImpl*)user_data;