diff options
| author | Armin Weatherwax | 2010-01-01 12:59:25 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-01-03 16:31:44 -0600 |
| commit | 6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e (patch) | |
| tree | bac0122928909ec635f62d8daf0bdb368750f7c0 /linden/indra/newview/llviewermedia.cpp | |
| parent | Updating a few 64bit Linux libs. (diff) | |
| download | meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.zip meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.tar.gz meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.tar.bz2 meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.tar.xz | |
Fix just another hardcoded path to Linux-i686.
(Cherry picked by Jacek from 2e96ac24)
Diffstat (limited to 'linden/indra/newview/llviewermedia.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermedia.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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 ) | |||
| 532 | #elif LL_LINUX | 532 | #elif LL_LINUX |
| 533 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); | 533 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); |
| 534 | component_dir += gDirUtilp->getDirDelimiter(); | 534 | component_dir += gDirUtilp->getDirDelimiter(); |
| 535 | component_dir += "mozilla-runtime-linux-i686"; | 535 | |
| 536 | #if LINUX64 | ||
| 537 | component_dir += "mozilla-runtime-linux-x86_64"; | ||
| 538 | #else | ||
| 539 | component_dir += "mozilla-runtime-linux-i686"; | ||
| 540 | #endif | ||
| 541 | |||
| 536 | #elif LL_SOLARIS | 542 | #elif LL_SOLARIS |
| 537 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); | 543 | std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); |
| 538 | component_dir += gDirUtilp->getDirDelimiter(); | 544 | component_dir += gDirUtilp->getDirDelimiter(); |