Merge branch 'libotr' into exp

Conflicts:
	linden/indra/llmessage/message.cpp
	linden/indra/newview/llprefsadvanced.cpp

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 @@
 
 //----------------------------------------------------------------------------
 // viewer.cpp - these are only used in viewer, should be easily moved.
+
+#if USE_OTR          // [$PLOTR$]
+#include "otr_wrapper.h"
+#endif // COMPILE_OTR    // [/$PLOTR$]
+
 extern void disable_win_error_reporting();
 
 #if LL_DARWIN
@@ -3785,6 +3790,10 @@ void LLAppViewer::idle()
 
 void LLAppViewer::idleShutdown()
 {
+#if USE_OTR          // [$PLOTR$]
+    OTR_Wrapper::logout();
+#endif // USE_OTR    // [/$PLOTR$]
+
         // Wait for all modal alerts to get resolved
         if (LLModalDialog::activeCount() > 0)
         {
@@ -4365,4 +4374,7 @@ void LLAppViewer::handleLoginComplete()
                 gRlvHandler.processRetainedCommands();
         }
 // [/RLVa:KB]
+#if USE_OTR         // [$PLOTR$]
+    OTR_Wrapper::init();
+#endif // USE_OTR   // [/$PLOTR$]
 }