From f929ec2d64155fd2921fb8e0cd13a59b5552b1bc Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Fri, 4 Sep 2009 17:05:31 +0000
Subject: [PATCH] Fixed the Linux build of viewer-2.0.0-3.
- Updated linux_updater for new LLStringUtil::getTokens() signature
- Ignore compiler warning for string constants not being referred to
as const in fmod_error.h
Fix for DEV-39457. Reviewed by moss.
---
indra/linux_updater/linux_updater.cpp | 2 +-
indra/llaudio/CMakeLists.txt | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/linux_updater/linux_updater.cpp b/indra/linux_updater/linux_updater.cpp
index b93890ab325..4b0bf6a2d9f 100644
--- a/indra/linux_updater/linux_updater.cpp
+++ b/indra/linux_updater/linux_updater.cpp
@@ -90,7 +90,7 @@ bool translate_init(std::string comma_delim_path_list,
// extract paths string vector from comma-delimited flat string
std::vector<std::string> paths;
- LLStringUtil::getTokens(comma_delim_path_list, paths); // split over ','
+ LLStringUtil::getTokens(comma_delim_path_list, paths, ","); // split over ','
// suck the translation xml files into memory
LLXMLNodePtr root;
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 80245fd569b..9e9e1aaeaec 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -62,7 +62,8 @@ if (FMOD)
if (LINUX)
if (${CXX_VERSION} MATCHES "4.[23]")
set_source_files_properties(llaudioengine_fmod.cpp
- COMPILE_FLAGS -Wno-error=write-strings)
+ llstreamingaudio_fmod.cpp
+ COMPILE_FLAGS -Wno-write-strings)
endif (${CXX_VERSION} MATCHES "4.[23]")
endif (LINUX)
endif (FMOD)
--
GitLab