1 files changed, 16 insertions, 2 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1a24a41..9ff5906 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 #
-# Compilation options shared by all Second Life components.
+# Compilation options shared by all components.
 
 include(Variables)
 
@@ -69,6 +69,10 @@ if (WINDOWS)
       /MP
       )
      
+  add_definitions(
+      /DUSE_OTR=1
+      )
+     
   if(MSVC80 OR MSVC90)
     set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
@@ -149,6 +153,10 @@ if (LINUX)
       -pthread
       )
 
+    add_definitions(
+        -DUSE_OTR=1
+        )
+
   if (SERVER)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-60")
     if (EXISTS /etc/debian_version)
@@ -172,7 +180,8 @@ if (LINUX)
   endif (SERVER)
 
   if (VIEWER)
-    add_definitions(-DAPPID=imprudence)
+    # Hmm, APPID does not seem to be used anywhere, but might be used implicitly somewhere.  It also does not like being "meta-impy", so changing this to stop it bitching.
+    add_definitions(-DAPPID=metaImpy)
     add_definitions(-fvisibility=hidden)
     # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work.  Sigh!  The viewer doesn't need to catch SIGCHLD anyway.
     add_definitions(-DLL_IGNORE_SIGCHLD)
@@ -195,6 +204,11 @@ endif (LINUX)
 
 if (DARWIN)
   add_definitions(-DLL_DARWIN=1)
+
+  add_definitions(
+    -DUSE_OTR=1
+  )
+
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -mssse3 -w")