Move tho OTR preferences to their own floater, with a button in the IM tab.

This brings that part in line with the general impy look and feel.

1 files changed, 0 insertions, 18 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 38e6745..49dd058 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -47,10 +47,6 @@
 
 #include "boost/algorithm/string.hpp"
 
-#if USE_OTR         // [$PLOTR$]
-#include "llweb.h"
-#endif // USE_OTR   // [/$PLOTR$]
-
 LLPrefsAdvanced* LLPrefsAdvanced::sInstance;
 
 LLPrefsAdvanced::LLPrefsAdvanced()
@@ -119,10 +115,6 @@ BOOL LLPrefsAdvanced::postBuild()
 
         initHelpBtn("EmeraldHelp_SpellCheck",           "EmeraldHelp_SpellCheck");
 
-#if USE_OTR         // [$PLOTR$]
-        childSetValue("EmeraldUseOTR", LLSD((S32)gSavedSettings.getU32("EmeraldUseOTR")));
-        getChild<LLButton>("otr_help_btn")->setClickedCallback(onClickOtrHelp, this);
-#endif // USE_OTR   // [/$PLOTR$]
 
         refresh();
 
@@ -210,9 +202,6 @@ void LLPrefsAdvanced::apply()
 
         LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
         gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
-#if USE_OTR         // [$PLOTR$]
-        gSavedSettings.setU32("EmeraldUseOTR", (U32)childGetValue("EmeraldUseOTR").asReal());
-#endif // USE_OTR   // [/$PLOTR$]
 }
 
 void LLPrefsAdvanced::cancel()
@@ -342,10 +331,3 @@ void LLPrefsAdvanced::onClickCommandLine(void* data)
         FloaterCommandLine::getInstance()->open();
         FloaterCommandLine::getInstance()->center();
 }
-
-#if USE_OTR         // [$PLOTR$]
-void LLPrefsAdvanced::onClickOtrHelp(void* data)
-{
-    LLWeb::loadURL("http://www.cypherpunks.ca/otr/");
-}
-#endif // USE_OTR   // [/$PLOTR$]