Second Life viewer sources 1.23.0-RC

1 files changed, 10 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 4d43dd8..70fc78d 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -525,6 +526,14 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
         std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
         component_dir += gDirUtilp->getDirDelimiter();
         component_dir += "mozilla-runtime-linux-i686";
+#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();