diff options
author | Armin Weatherwax | 2010-01-01 12:59:25 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-04-29 01:15:00 -0500 |
commit | 2e0d8732cca561f04922ef23be1733d51e32de42 (patch) | |
tree | 6ec0459e45dcb40c748785ae4fe0eb36e17bf19d /linden/indra/newview/llviewermedia.cpp | |
parent | Updating a few 64bit Linux libs. (diff) | |
download | meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.zip meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.tar.gz meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.tar.bz2 meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.tar.xz |
Fix just another hardcoded path to Linux-i686.
(Backported from 6d50eb4a) @nochangelog
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermedia.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
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 ) | |||
531 | #elif LL_LINUX | 531 | #elif LL_LINUX |
532 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); | 532 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); |
533 | component_dir += gDirUtilp->getDirDelimiter(); | 533 | component_dir += gDirUtilp->getDirDelimiter(); |
534 | component_dir += "mozilla-runtime-linux-i686"; | 534 | |
535 | #if LINUX64 | ||
536 | component_dir += "mozilla-runtime-linux-x86_64"; | ||
537 | #else | ||
538 | component_dir += "mozilla-runtime-linux-i686"; | ||
539 | #endif | ||
540 | |||
541 | #elif LL_SOLARIS | ||
542 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); | ||
543 | component_dir += gDirUtilp->getDirDelimiter(); | ||
544 | #ifdef __sparc | ||
545 | component_dir += "mozilla-solaris-sparc"; | ||
546 | #else | ||
547 | component_dir += "mozilla-solaris-i686"; | ||
548 | #endif | ||
535 | #else | 549 | #else |
536 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); | 550 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); |
537 | component_dir += gDirUtilp->getDirDelimiter(); | 551 | component_dir += gDirUtilp->getDirDelimiter(); |