diff options
Diffstat (limited to 'linden/indra/newview/llprefsim.cpp')
-rw-r--r-- | linden/indra/newview/llprefsim.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp index 5ac2bb2..c2659b8 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 | protected: | 79 | protected: |
78 | 80 | ||
@@ -131,6 +133,7 @@ BOOL LLPrefsIMImpl::postBuild() | |||
131 | childSetCommitCallback("log_instant_messages",onCommitLogging,this); | 133 | childSetCommitCallback("log_instant_messages",onCommitLogging,this); |
132 | 134 | ||
133 | childSetAction("busy_adv_btn", onClickBusyAdvanced, this); | 135 | childSetAction("busy_adv_btn", onClickBusyAdvanced, this); |
136 | childSetAction("otr_adv_btn", onClickOTRAdvanced, this); | ||
134 | 137 | ||
135 | preparePerAccountPrefs(LLStartUp::isLoggedIn()); | 138 | preparePerAccountPrefs(LLStartUp::isLoggedIn()); |
136 | 139 | ||
@@ -328,6 +331,13 @@ void LLPrefsIMImpl::onClickBusyAdvanced(void* user_data) | |||
328 | } | 331 | } |
329 | 332 | ||
330 | // static | 333 | // static |
334 | void LLPrefsIMImpl::onClickOTRAdvanced(void* user_data) | ||
335 | { | ||
336 | FloaterOTR::getInstance()->open(); | ||
337 | FloaterOTR::getInstance()->center(); | ||
338 | } | ||
339 | |||
340 | // static | ||
331 | void LLPrefsIMImpl::onClickLogPath(void* user_data) | 341 | void LLPrefsIMImpl::onClickLogPath(void* user_data) |
332 | { | 342 | { |
333 | LLPrefsIMImpl* self=(LLPrefsIMImpl*)user_data; | 343 | LLPrefsIMImpl* self=(LLPrefsIMImpl*)user_data; |