2 files changed, 18 insertions, 1 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 9b3f423..8a0f8a9 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -163,6 +163,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 b791786..3de0804 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -531,7 +531,21 @@ 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();
+        #ifdef  __sparc
+                component_dir += "mozilla-solaris-sparc";
+        #else
+                component_dir += "mozilla-solaris-i686";
+        #endif
 #else
         std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
         component_dir += gDirUtilp->getDirDelimiter();