aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
-rw-r--r--linden/indra/newview/llappviewer.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index d76b722..09b4eda 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -206,6 +206,11 @@
206 206
207//---------------------------------------------------------------------------- 207//----------------------------------------------------------------------------
208// viewer.cpp - these are only used in viewer, should be easily moved. 208// viewer.cpp - these are only used in viewer, should be easily moved.
209
210#if USE_OTR // [$PLOTR$]
211#include "otr_wrapper.h"
212#endif // COMPILE_OTR // [/$PLOTR$]
213
209extern void disable_win_error_reporting(); 214extern void disable_win_error_reporting();
210 215
211#if LL_DARWIN 216#if LL_DARWIN
@@ -3785,6 +3790,10 @@ void LLAppViewer::idle()
3785 3790
3786void LLAppViewer::idleShutdown() 3791void LLAppViewer::idleShutdown()
3787{ 3792{
3793#if USE_OTR // [$PLOTR$]
3794 OTR_Wrapper::logout();
3795#endif // USE_OTR // [/$PLOTR$]
3796
3788 // Wait for all modal alerts to get resolved 3797 // Wait for all modal alerts to get resolved
3789 if (LLModalDialog::activeCount() > 0) 3798 if (LLModalDialog::activeCount() > 0)
3790 { 3799 {
@@ -4365,4 +4374,7 @@ void LLAppViewer::handleLoginComplete()
4365 gRlvHandler.processRetainedCommands(); 4374 gRlvHandler.processRetainedCommands();
4366 } 4375 }
4367// [/RLVa:KB] 4376// [/RLVa:KB]
4377#if USE_OTR // [$PLOTR$]
4378 OTR_Wrapper::init();
4379#endif // USE_OTR // [/$PLOTR$]
4368} 4380}