diff options
Diffstat (limited to 'linden/indra/mac_crash_logger/llcrashloggermac.cpp')
-rw-r--r-- | linden/indra/mac_crash_logger/llcrashloggermac.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/mac_crash_logger/llcrashloggermac.cpp b/linden/indra/mac_crash_logger/llcrashloggermac.cpp index 36d8285..8ed2ec7 100644 --- a/linden/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/linden/indra/mac_crash_logger/llcrashloggermac.cpp | |||
@@ -57,7 +57,7 @@ LLFILE *gDebugFile = NULL; | |||
57 | 57 | ||
58 | WindowRef gWindow = NULL; | 58 | WindowRef gWindow = NULL; |
59 | EventHandlerRef gEventHandler = NULL; | 59 | EventHandlerRef gEventHandler = NULL; |
60 | LLString gUserNotes = ""; | 60 | std::string gUserNotes = ""; |
61 | bool gSendReport = false; | 61 | bool gSendReport = false; |
62 | bool gRememberChoice = false; | 62 | bool gRememberChoice = false; |
63 | IBNibRef nib = NULL; | 63 | IBNibRef nib = NULL; |
@@ -217,16 +217,16 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles() | |||
217 | if(FSRefMakePath(&folder, (UInt8*)&path, sizeof(path)) == noErr) | 217 | if(FSRefMakePath(&folder, (UInt8*)&path, sizeof(path)) == noErr) |
218 | { | 218 | { |
219 | struct stat dw_stat; | 219 | struct stat dw_stat; |
220 | LLString mBuf; | 220 | std::string mBuf; |
221 | bool isLeopard = false; | 221 | bool isLeopard = false; |
222 | // Try the 10.3 path first... | 222 | // Try the 10.3 path first... |
223 | LLString dw_file_name = LLString(path) + LLString("/CrashReporter/Second Life.crash.log"); | 223 | std::string dw_file_name = std::string(path) + std::string("/CrashReporter/Second Life.crash.log"); |
224 | int res = stat(dw_file_name.c_str(), &dw_stat); | 224 | int res = stat(dw_file_name.c_str(), &dw_stat); |
225 | 225 | ||
226 | if (res) | 226 | if (res) |
227 | { | 227 | { |
228 | // Try the 10.2 one next... | 228 | // Try the 10.2 one next... |
229 | dw_file_name = LLString(path) + LLString("/Second Life.crash.log"); | 229 | dw_file_name = std::string(path) + std::string("/Second Life.crash.log"); |
230 | res = stat(dw_file_name.c_str(), &dw_stat); | 230 | res = stat(dw_file_name.c_str(), &dw_stat); |
231 | } | 231 | } |
232 | 232 | ||
@@ -235,8 +235,8 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles() | |||
235 | //10.5: Like 10.3+, except it puts the crash time in the file instead of dividing it up | 235 | //10.5: Like 10.3+, except it puts the crash time in the file instead of dividing it up |
236 | //using asterisks. Get a directory listing, search for files starting with second life, | 236 | //using asterisks. Get a directory listing, search for files starting with second life, |
237 | //use the last one found. | 237 | //use the last one found. |
238 | LLString old_file_name, current_file_name, pathname, mask; | 238 | std::string old_file_name, current_file_name, pathname, mask; |
239 | pathname = LLString(path) + LLString("/CrashReporter/"); | 239 | pathname = std::string(path) + std::string("/CrashReporter/"); |
240 | mask = "Second Life*"; | 240 | mask = "Second Life*"; |
241 | while(gDirUtilp->getNextFileInDir(pathname, mask, current_file_name, false)) | 241 | while(gDirUtilp->getNextFileInDir(pathname, mask, current_file_name, false)) |
242 | { | 242 | { |
@@ -331,7 +331,7 @@ bool LLCrashLoggerMac::mainLoop() | |||
331 | return true; | 331 | return true; |
332 | } | 332 | } |
333 | 333 | ||
334 | void LLCrashLoggerMac::updateApplication(LLString message) | 334 | void LLCrashLoggerMac::updateApplication(const std::string& message) |
335 | { | 335 | { |
336 | LLCrashLogger::updateApplication(); | 336 | LLCrashLogger::updateApplication(); |
337 | } | 337 | } |