aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:29 -0500
committerJacek Antonelli2008-08-15 23:45:29 -0500
commit7bdb4845afdd157f95281293803567090e3f992a (patch)
treefbcada1c227d7407f9f37ccba360bfe6326d9c5e /linden/indra/llcommon
parentSecond Life viewer sources 1.19.0.0 (diff)
downloadmeta-impy-7bdb4845afdd157f95281293803567090e3f992a.zip
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.gz
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.bz2
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.xz
Second Life viewer sources 1.19.0.2
Diffstat (limited to 'linden/indra/llcommon')
-rw-r--r--linden/indra/llcommon/indra_constants.h2
-rw-r--r--linden/indra/llcommon/llapr.cpp4
-rw-r--r--linden/indra/llcommon/llfasttimer.h2
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
4 files changed, 8 insertions, 2 deletions
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 6cb2e29..16e471d 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -336,7 +336,7 @@ const U32 MAP_ITEM_CLASSIFIED = 0x08;
336 336
337// Crash reporter behavior 337// Crash reporter behavior
338const char* const CRASH_SETTINGS_FILE = "crash_settings.xml"; 338const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
339const char* const CRASH_BEHAVIOR_SETTING = "CrashLogBehavior"; 339const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior";
340const S32 CRASH_BEHAVIOR_ASK = 0; 340const S32 CRASH_BEHAVIOR_ASK = 0;
341const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1; 341const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
342const S32 CRASH_BEHAVIOR_NEVER_SEND = 2; 342const S32 CRASH_BEHAVIOR_NEVER_SEND = 2;
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index a577cc7..2a81e5e 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -293,6 +293,7 @@ bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool)
293 if (s != APR_SUCCESS) 293 if (s != APR_SUCCESS)
294 { 294 {
295 llwarns << "ll_apr_file_remove failed on file: " << filename << llendl; 295 llwarns << "ll_apr_file_remove failed on file: " << filename << llendl;
296 ll_apr_warn_status(s);
296 return false; 297 return false;
297 } 298 }
298 return true; 299 return true;
@@ -306,6 +307,7 @@ bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_p
306 if (s != APR_SUCCESS) 307 if (s != APR_SUCCESS)
307 { 308 {
308 llwarns << "ll_apr_file_rename failed on file: " << filename << llendl; 309 llwarns << "ll_apr_file_rename failed on file: " << filename << llendl;
310 ll_apr_warn_status(s);
309 return false; 311 return false;
310 } 312 }
311 return true; 313 return true;
@@ -362,6 +364,7 @@ bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool)
362 if (s != APR_SUCCESS) 364 if (s != APR_SUCCESS)
363 { 365 {
364 llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl; 366 llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl;
367 ll_apr_warn_status(s);
365 return false; 368 return false;
366 } 369 }
367 return true; 370 return true;
@@ -375,6 +378,7 @@ bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool)
375 if (s != APR_SUCCESS) 378 if (s != APR_SUCCESS)
376 { 379 {
377 llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl; 380 llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl;
381 ll_apr_warn_status(s);
378 return false; 382 return false;
379 } 383 }
380 return true; 384 return true;
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h
index b953960..3ecf176 100644
--- a/linden/indra/llcommon/llfasttimer.h
+++ b/linden/indra/llcommon/llfasttimer.h
@@ -92,6 +92,8 @@ public:
92 92
93 // newview specific 93 // newview specific
94 FTM_MESSAGES, 94 FTM_MESSAGES,
95 FTM_MOUSEHANDLER,
96 FTM_KEYHANDLER,
95 FTM_REBUILD, 97 FTM_REBUILD,
96 FTM_STATESORT, 98 FTM_STATESORT,
97 FTM_STATESORT_DRAWABLE, 99 FTM_STATESORT_DRAWABLE,
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 6c5a1ce..e85fa5d 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
35const S32 LL_VERSION_MAJOR = 1; 35const S32 LL_VERSION_MAJOR = 1;
36const S32 LL_VERSION_MINOR = 19; 36const S32 LL_VERSION_MINOR = 19;
37const S32 LL_VERSION_PATCH = 0; 37const S32 LL_VERSION_PATCH = 0;
38const S32 LL_VERSION_BUILD = 0; 38const S32 LL_VERSION_BUILD = 2;
39 39
40const char * const LL_CHANNEL = "Second Life Release"; 40const char * const LL_CHANNEL = "Second Life Release";
41 41