1 files changed, 77 insertions, 10 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 0871d16..ecbeb9b 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -15,6 +15,24 @@ include(HUNSPELL)
 include(FindOpenGL)
 include(JsonCpp)
 include(LLAddBuildTest)
+
+# [$PLOTR$]
+include(libgpg-error)
+include(libgcrypt)
+
+if (WINDOWS)
+    include(libotr)
+    # on windows always build libotr from source and statically link in libgcrypt and libgpg-error
+endif (WINDOWS)
+if (DARWIN OR LINUX)
+  if (STATIC_LIBOTR_ETC)
+    include(libotr) # to build libotr from source and statically link in libgcrypt and libgpg-error
+  else (STATIC_LIBOTR_ETC)
+    include(libotrb)
+  endif (STATIC_LIBOTR_ETC)
+endif (DARWIN OR LINUX)
+# [/$PLOTR$]
+
 include(LLAudio)
 include(LLCharacter)
 include(LLCommon)
@@ -37,7 +55,6 @@ include(GooglePerfTools)
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
-include(ViewerArtwork)
 include(ViewerMiscLibs)
 
 if (WINDOWS)
@@ -67,6 +84,21 @@ include_directories(
     ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
     )
 
+# [$PLOTR$]
+if (WINDOWS)
+    include_directories(
+        ../gpg.vs/inc.vs
+        ../gpg.vs/libgpg-error-1.1.vs/custom
+        ../gpg.vs/libgcrypt-1.2.2.vs/custom
+    )
+endif (WINDOWS)
+include_directories(
+    ${LIBGPG-ERROR_INCLUDE_DIRS}
+    ${LIBGCRYPT_INCLUDE_DIRS}
+    ../libotr/libotr-3.2.0/src
+)
+# [/$PLOTR$]
+
 set(viewer_SOURCE_FILES
         lggautocorrectfloater.cpp
         lggautocorrect.cpp
@@ -83,6 +115,7 @@ set(viewer_SOURCE_FILES
     floatergriddefault.cpp
     floatergridmanager.cpp
     floaterlocalassetbrowse.cpp
+    floaterotr.cpp
     floatervoicelicense.cpp
     hbfloatergrouptitles.cpp
     hippogridmanager.cpp
@@ -509,9 +542,14 @@ set(viewer_SOURCE_FILES
     wlfloaterwindlightsend.cpp
     wlretrievesettings.cpp
     wlsettingsmanager.cpp
+# [/$PLOTR$]
+    otr_wrapper.cpp
+    otr_floater_smp_dialog.cpp
+    otr_floater_smp_progress.cpp
+# [/$PLOTR$]
     )
 
-set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING
+set(VIEWER_BINARY_NAME "meta-impy-bin" CACHE STRING
     "The name of the viewer executable to create.")
 
 if (LINUX)
@@ -542,6 +580,7 @@ set(viewer_HEADER_FILES
     floatergriddefault.h
     floatergridmanager.h
     floaterlocalassetbrowse.h
+    floaterotr.h
     floatervoicelicense.h
     hbfloatergrouptitles.h
     hippogridmanager.h
@@ -982,6 +1021,11 @@ set(viewer_HEADER_FILES
     wlfloaterwindlightsend.h
     wlretrievesettings.h
     wlsettingsmanager.h
+# [$PLOTR$]
+    otr_wrapper.h
+    otr_floater_smp_dialog.h
+    otr_floater_smp_progress.h
+# [/$PLOTR$]
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
@@ -1008,7 +1052,7 @@ if (DARWIN)
     macview.r
     gpu_table.txt
     packaging/mac/Info.plist.in
-    packaging/mac/SecondLife.nib/
+    packaging/mac/viewer.nib/
     # CMake doesn't seem to support Xcode language variants well just yet
     packaging/mac/English.lproj/InfoPlist.strings
     packaging/mac/English.lproj/language.txt
@@ -1030,9 +1074,19 @@ if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
+  # [$PLOTR$] 
+  if (STATIC_LIBOTR_ETC) # defined in .../linden/indra/CMakeLists.txt
+    set(viewer_LIBRARIES
+        Xinerama
+        ${LIBGPG-ERROR_LDBRARIES}
+        ${LIBGCRYPT-ERROR_LDBRARIES}
+        )
+  else (STATIC_LIBOTR_ETC) # below for dynamically linked, unmodified libotr
     set(viewer_LIBRARIES
         Xinerama
         )
+  endif (STATIC_LIBOTR_ETC)
+  # [/$PLOTR$]
 endif (LINUX)
 
 if (WINDOWS)
@@ -1074,7 +1128,7 @@ if (WINDOWS)
         res/arrowdrag.cur
         res/circleandline.cur
         res/imp_icon.ico
-        res/imprudence_icon.png
+        res/meta-impy_icon.png
         res/llarrow.cur
         res/llarrowdrag.cur
         res/llarrowdragmulti.cur
@@ -1201,19 +1255,15 @@ set(viewer_APPSETTINGS_FILES
     app_settings/cmd_line.xml
     app_settings/default_grids.xml
     app_settings/grass.xml
-    app_settings/high_graphics.xml
     app_settings/keys.ini
     app_settings/keywords.ini
     app_settings/logcontrol.xml
-    app_settings/low_graphics.xml
-    app_settings/mid_graphics.xml
     app_settings/settings.xml
     app_settings/settings_crash_behavior.xml
     app_settings/settings_files.xml
     app_settings/settings_per_account.xml
     app_settings/std_bump.ini
     app_settings/trees.xml
-    app_settings/ultra_graphics.xml
     app_settings/viewerart.xml
     ${CMAKE_SOURCE_DIR}/../etc/message.xml
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
@@ -1290,7 +1340,7 @@ add_executable(${VIEWER_BINARY_NAME}
     MACOSX_BUNDLE
     ${viewer_SOURCE_FILES}
     )
-check_message_template(${VIEWER_BINARY_NAME})
+#check_message_template(${VIEWER_BINARY_NAME})
 
 
 # NOTE: This variable is DEPRECATED, and should not be used anymore.
@@ -1393,7 +1443,25 @@ if (WINDOWS)
     endif (PACKAGE)
 endif (WINDOWS)
 
+# [$PLOTR$]
+if (WINDOWS)
+    set(otr_link_libs ${LIBGPG-ERROR_LIBRARIES}
+                      ${LIBGCRYPT_LIBRARIES}
+                      ${LIBOTR_LIBRARIES}
+       )
+else (WINDOWS)
+  if (STATIC_LIBOTR_ETC)
+    set(otr_link_libs ${LIBOTR_LIBRARIES}
+       ) # statically linked libotr, built from source
+  else (STATIC_LIBOTR_ETC)
+    set(otr_link_libs ${OTR_LIBRARY}
+       )
+  endif (STATIC_LIBOTR_ETC)
+endif (WINDOWS)
+# [/$PLOTR$]
+
 target_link_libraries(${VIEWER_BINARY_NAME}
+    ${otr_link_libs}
     ${LLAUDIO_LIBRARIES}
     ${LLCHARACTER_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
@@ -1439,7 +1507,6 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
 
 
 if (LINUX)
-
   string(REPLACE "-bin" "-stripped"
          VIEWER_STRIPPED_NAME ${VIEWER_BINARY_NAME})