From 1d18eb043ab71998bded6931e181e53cbb9bf386 Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Mon, 5 Mar 2007 22:09:52 +0000 Subject: merge -r57991:58444 branches/distribute/user/mute to release --- indra/llcommon/llerror.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index bbff363f54..9d60dde672 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -988,15 +988,26 @@ namespace LLError return std::string(s, where + p.size()); } + void replaceChar(std::string& s, char old, char replacement) + { + std::string::size_type i = 0; + std::string::size_type len = s.length(); + for ( ; i < len; i++ ) + { + if (s[i] == old) + { + s[i] = replacement; + } + } + } + std::string abbreviateFile(const std::string& filePath) { std::string f = filePath; - #if LL_WINDOWS - static std::string indra_prefix = "indra\\"; -#else - static std::string indra_prefix = "indra/"; + replaceChar(f, '\\', '/'); #endif + static std::string indra_prefix = "indra/"; f = removePrefix(f, indra_prefix); #if LL_DARWIN -- cgit v1.2.3