89a6a001fc
Merge viewer-neko
2019-06-17 21:48:11 +02:00
930bf680c2
SL-10423 Dump path data when missing critical file
2019-06-03 21:37:43 +03:00
482e9e642d
FIRE-24023: Separate account directories per grid on Havok builds as well
2019-05-26 12:08:37 +02:00
36cb6933e6
Merged in lindenlab/viewer-release
2019-03-01 02:24:00 +02:00
fa15830e02
SL-10291 Replace apr_atomic with standard C++11 functionality
2019-01-15 18:31:17 +02:00
346fc435f1
SL-10291 cleanup-mutex
2019-01-17 01:53:27 +02:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
4a13657285
SL-10153: auto name{expression} declares an initializer_list
...
instead of a variable of type decltype(expression).
Using SHGetKnownFolderPath(FOLDERID_Fonts) in LLFontGL::getFontPathSystem()
requires new Windows #include files.
A variable with a constructor can't be declared within the braces of a switch
statement, even outside any of its case clauses.
2018-12-15 09:13:24 -05:00
c4096f670c
SL-10153: Review and rationalize fetching paths from environment.
...
Use LLStringUtil::getenv() or getoptenv() whenever we fetch a string that will
be used as a pathname.
Use LLFile::tmpdir() instead of getenv("TEMP").
As an added extra-special bonus, finally clean up $TMP/llcontrol-test-zzzzzz
directories that have been accumulating every time we run a local build!
2018-12-14 15:38:13 -05:00
bb4a649b9c
SL-10153: Validate APPDATA, LOCALAPPDATA by checking existence.
2018-12-11 15:47:29 -05:00
9479d422d4
SL-10153: Use a degenerate singleton for PRELOG log file.
...
The previous build declared a static std::ofstream; but the code that
determines the pathname for the log file is called so early that static
objects have not yet been constructed. Declare a pointer instead, and
instantiate it on demand.
2018-12-10 17:14:31 -05:00
601cbe1f60
SL-10153: Add ole32 to WINDOWS_LIBRARIES so it's everywhere we need.
2018-12-08 12:18:46 -05:00
a4eb5056a7
SL-10153: Need ole32 for new Windows call to CoTaskMemFree().
2018-12-08 11:26:37 -05:00
a36cd3a292
SL-10153: Try to handle non-English non-ASCII Windows APPDATA.
2018-12-08 10:30:18 -05:00
758e7e8df7
SL-10174: LOCALAPPDATA bad? Try SHGetFolderPath(CSIDL_LOCAL_APPDATA).
...
This logic is essentially copy-and-edited from the same suspenders-and-belt
concerning APPDATA and CSIDL_APPDATA for SL-10153.
2018-12-06 14:33:51 -05:00
7a336f63cc
SL-10153: If $APPDATA isn't already good, try SHGetFolderPath().
...
In that case, also update $APPDATA for child processes.
2018-12-05 16:57:00 -05:00
036c52fcdf
Automated merge with ssh://bitbucket.org/nat_linden/viewer-poseidon
2018-10-17 10:31:59 -04:00
289813994e
DRTVWR-474: Clean up use of LLDir::getAppRODataDir(), esp. on Mac.
...
Clearly it's not obvious to maintainers that on the Mac, getAppRODataDir()
returns the app's Resources directory: in a number of places the code starts
with the executable directory and appends "../Resources" to find that.
2018-09-13 16:20:05 -04:00
9fd463bd94
remove only-partially-successful attempt to put teamcity blocks around targets
2018-09-07 09:13:57 -04:00
49c483eeb3
add more block structure to TeamCity log output for components
2018-09-05 18:07:35 -04:00
db970c1a5f
Don't compare rbegin() iterators, use LLStringUtil::endsWith().
...
I think the intention of (sDumpDir.rbegin() == mDirDelimiter.rbegin()) was to
test whether sDumpDir endsWith(mDirDelimiter). But those iterators will never
be equal. Instead, use LLStringUtil::endsWith().
2018-08-21 19:23:33 -04:00
c96314964a
Merge Firestorm LGPL
2019-03-01 17:36:52 +01:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
8b6392c0aa
Merge viewer-bugsplat
2018-12-16 13:04:08 +01:00
04e6314e77
Backed out changeset: 79a10cf7bf74
2018-12-16 11:19:53 +01:00
ee34ea1f4b
Merge viewer-bugsplat
2018-10-27 00:50:58 +02:00
23473b4585
Merge viewer-bugsplat
2018-08-22 14:22:22 +02:00
31a1ba1701
Merge Firestorm LGPL
2018-05-08 18:31:13 +02:00
712ad00213
Merge.
2018-04-21 21:44:09 +02:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
d5de986a95
CA file path fix
2018-03-02 20:45:02 +01:00
cb3187c485
Fix CA file location for other OS as well
2018-03-02 14:47:43 +01:00
364072f2bf
MAINT-8297 Mac path fix
2018-03-02 15:17:05 +02:00
6219aec54f
Merge viewer-neko
2018-03-02 10:52:44 +01:00
5100abb778
MAINT-8297 Cleanup
2018-03-01 02:44:08 +02:00
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
481713000b
MAINT-8183 Fixed some exit issues and crashes
2018-02-22 15:23:14 +02:00
e55fcbeeee
MAINT-8297 Removing old ca bundle
2018-02-21 17:32:06 +00:00
b2f61c0e0b
MAINT-8297 Fixed "Missing CA File" message when running under debugger on windows
2018-02-15 21:48:18 +02:00
acfe64221e
Load the correct CA file
2018-02-15 13:06:12 +01:00
80aa2d7d50
Fix running firestorm from visual studio
2018-02-15 02:36:13 -08:00
5a273d430a
MAINT-8297 path fix #2
2018-03-02 19:46:06 +02:00
806262c388
MAINT-8297 path fix
2018-03-02 18:47:35 +02:00
dd3523be11
Merge Firestorm LGPL bear
2018-02-12 22:25:25 +01:00
e6765df1ba
Merged in lindenlab/viewer-bear
2018-02-12 21:15:00 +02:00
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
7379605d65
MAINT-8047 [Mac] Incorrect VFS (cache) creation time is shown in "help>about SL"
2018-01-23 18:14:04 +02:00
3a1fcb9521
Merge Firestorm LGPL
2018-01-17 20:28:45 +01:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
Ansariel