Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

indra/cmake/Python.cmake

@@ -57,7 +57,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(PYTHONINTERP_FOUND ON)
   endif (PYTHON_EXECUTABLE)
 else (WINDOWS)
-  include(FindPythonInterp)
+  include(FindPython2)
+  set( PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
 endif (WINDOWS)
 
 if (NOT PYTHON_EXECUTABLE)

indra/cmake/run_build_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """\
 @file   run_build_test.py
 @author Nat Goodspeed

indra/newview/llappviewerlinux.cpp

@@ -137,19 +137,13 @@ LLAppViewerLinux::~LLAppViewerLinux()
 {
 }
 
+#if LL_SEND_CRASH_REPORTS
 static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context, bool succeeded)
 {
-   std::map< std::string, std::string> parameters, files;
-   parameters["prod"] = "MyApp";
-   parameters["ver"] = "1.0";
-   parameters["email"] = "fred@bugsplat.com";
-   parameters["comments"] = "BugSplat rocks!";
-   files["upload_file_minidump"] = descriptor.path();
-
     printf("Dump path: %s\n", descriptor.path() );
     return succeeded;
 }
-
+#endif
 
 bool LLAppViewerLinux::init()
 {