diff options
| author | James Cook <james@lindenlab.com> | 2009-12-02 17:17:54 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-02 17:17:54 -0800 |
| commit | 0a490ca37739bc11a23623710c74a4977bc45186 (patch) | |
| tree | a5741070c10e9e318865d42c4dd2fa7692b817c1 /indra | |
| parent | 48a2636fe31b73ec1cbc03703351424b978c5e4a (diff) | |
| parent | 9897e53de5adcdedbe086df38b740bf4c2d8abe7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 7 | ||||
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 342accad7a..5a142f23c9 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -35,7 +35,6 @@ if(WINDOWS) set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(debug_files openjpegd.dll - libtcmalloc_minimal-debug.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll @@ -46,12 +45,16 @@ if(WINDOWS) set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(release_files openjpeg.dll - libtcmalloc_minimal.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll ) + if(USE_GOOGLE_PERFTOOLS) + set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) + set(release_files ${release_files} libtcmalloc_minimal.dll) + endif(USE_GOOGLE_PERFTOOLS) + if (FMOD_SDK_DIR) set(fmod_files fmod.dll) endif (FMOD_SDK_DIR) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b01ff74e26..1c1f27a259 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -60,6 +60,7 @@ #include "llkeyboard.h" #include "llmodaldialog.h" #include "llnavigationbar.h" +#include "llnearbychat.h" #include "llnotifications.h" #include "llnotificationsutil.h" #include "llpanellogin.h" |