Fix just another hardcoded path to Linux-i686.

(Cherry picked by Jacek from 2e96ac24)

2 files changed, 10 insertions, 1 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 49fdb5b..355ce45 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -168,6 +168,9 @@ if (LINUX)
       # this stops us requiring a really recent glibc at runtime
       add_definitions(-fno-stack-protector)
     endif (NOT STANDALONE)
+    if (${ARCH} STREQUAL "x86_64")
+       add_definitions( -DLINUX64=1 )
+    endif (${ARCH} STREQUAL "x86_64")
   endif (VIEWER)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 8b95a9f..b6dd9d6 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -532,7 +532,13 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
 #elif LL_LINUX
         std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
         component_dir += gDirUtilp->getDirDelimiter();
-        component_dir += "mozilla-runtime-linux-i686";
+
+  #if LINUX64 
+        component_dir += "mozilla-runtime-linux-x86_64";
+  #else
+        component_dir += "mozilla-runtime-linux-i686";
+  #endif
+
 #elif LL_SOLARIS
         std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
         component_dir += gDirUtilp->getDirDelimiter();