Commit Graph

355 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Nat Goodspeed d10b06dc4f DRTVWR-493: When a test fails due to exception, display exception. 2019-08-19 10:00:09 -04:00
Nat Goodspeed adb3f447b3 DRTVWR-493: Introduce test catch_what(), catch_llerrs() functions.
Use them in place of awkward try/catch test boilerplate.
2019-08-10 20:33:59 -04:00
Ansariel 04e6314e77 Backed out changeset: 79a10cf7bf74 2018-12-16 11:19:53 +01:00
Ansariel 5532f87f80 Merge Firestorm LGPL 2018-11-16 00:09:19 +01:00
Nat Goodspeed f7e99f0db7 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2018-11-14 16:17:36 -05:00
Ansariel ee34ea1f4b Merge viewer-bugsplat 2018-10-27 00:50:58 +02:00
Oz Linden d87cc1859f Modify logging so that the in-viewer console and stderr do not escape line breaks
Improve the implementation so that escaping is computed only once
2018-10-11 14:17:52 -04:00
Brad Payne (Vir Linden) a84ee929a5 merge 2018-09-27 19:54:10 +01:00
Ansariel 23fd31faf6 Merge Firestorm LGPL 2018-09-27 11:59:30 +02:00
Oz Linden 88e04ab2ab Restore the ability for sockets to specify the interface to listen on 2018-08-30 16:25:45 -04:00
AndreyL ProductEngine 236f986d35 Backed out changeset: 871c2923afce 2018-08-28 22:26:12 +03:00
Ansariel 1f02cfc1de Merge viewer-neko 2018-08-16 14:51:06 +02:00
Nat Goodspeed 00839eb635 Add optional hostname param to LLSocket::create() for testing.
This allows the io.cpp test to listen only on the localhost loopback, avoiding
the macOS 10.13.6 "allow listening for incoming connections" popup while
running build-time tests that might halt an unattended TeamCity build.
2018-08-08 20:52:00 -04:00
Brad Payne (Vir Linden) 2b79663021 merge 2018-02-13 13:58:23 +00:00
Ansariel 76c179eeac Merge Firestorm LGPL 2018-02-12 23:20:50 +01:00
Ansariel 89e753a81d Merge Firestorm LGPL 2018-01-17 21:20:40 +01:00
Ansariel 3a1fcb9521 Merge Firestorm LGPL 2018-01-17 20:28:45 +01:00
Oz Linden d7c8678c3a merge 5.1.0-release 2018-01-17 12:43:28 -05:00
Brad Payne (Vir Linden) e36745eb98 merge 2018-01-17 16:06:27 +00:00
Ansariel a32f6defc6 Undo the changes from e4ab100d3f3e - SHGetKnownFolderPath works fine here with user "Testuseäöü" - no idea if the VMP launcher screws it up though 2018-01-04 14:26:26 +01:00
Nat Goodspeed 5002bf5660 MAINT-8087: Use env vars from VMP for AppData\Roaming and Local.
On Windows, when logged in with a non-ASCII username, every one of the three
documented APIs -- SHGetSpecialFolderPath(), SHGetFolderPath() and
SHGetKnownFolderPath() -- fails to retrieve any pathname at all. We cannot
account for the fact that the oldest of these continues to work with the
release viewer and within a Python script (though not, curiously, from a
Python interactive session). With a non-ASCII username, they consistently fail
when called from an Alex Ivy viewer build: "The filename, directory name, or
volume label syntax is incorrect."

Empirically, with a non-ASCII username, the preset APPDATA and LOCALAPPDATA
environment variables are also useless, e.g. c:\Users\??????\AppData\Roaming
where those are, yup, actual question marks.

Empirically, the VMP is able to successfully call SHGetFolderPath() to
retrieve both AppData\Roaming and AppData\Local. Therefore, we make the VMP
set the APPDATA and LOCALAPPDATA environment variables to the UTF-8 encoded
correct pathnames. Instead of calling SHGetSomethingFolderPath() at all, make
LLDir_Win32 retrieve those environment variables.

Make LLFile::mkdir() treat "directory already exists" as a success case. Every
single call fell into one of two categories: either it didn't check success at
all, or it tested specially to exempt errno == EEXIST. Migrate that test into
mkdir(); eliminate it from call sites.

Make LLDir::append() and add() convenience functions accept variadic
arguments. Replace add(add()...) constructs, as well as clumsy concatenations
of directory names and getDirDelimiter(), with simple variadic add() calls.
2017-12-20 22:51:26 -05:00
Nat Goodspeed 870008f15b MAINT-8087: New LLDir_Win32 code requires ole32 in a few more places. 2017-12-14 19:33:10 -05:00
Nat Goodspeed 0c7bc67814 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-10-11 14:35:49 -04:00
Ansariel 13ea9a242a Merge Firestorm LGPL 2017-10-11 20:30:12 +02:00
Ansariel 06db7c626f Merge Firestorm LGPL 2017-10-11 17:58:16 +02:00
Brad Payne (Vir Linden) 299592e88e merge 2017-10-11 14:16:39 +01:00
Oz Linden d62ad1ef8a merge changes for 5.0.8-release 2017-10-11 09:13:55 -04:00
Ansariel 2d6314182b Merge Firestorm LGPL 2017-10-11 19:53:58 +02:00
Ansariel 01d8e7e347 Merge axon 2017-09-20 01:09:14 +02:00
Ansariel 615336a4d4 Merge viewer-neko 2017-09-07 21:49:12 +02:00
Ansariel dd7580c4f9 Merge Firestorm LGPL 2017-07-21 08:54:52 +02:00
Brad Payne (Vir Linden) 2af5332e46 Added cycle_object_animations.lsl. Also change to test.cpp to see if it affects a g++ internal compiler error. 2017-06-30 21:59:39 +01:00
Ansariel 1baf1f5091 Merge Firestorm LGPL 2017-06-20 23:24:35 +02:00
Oz Linden d8be66c8e2 merge changes for 5.0.6-release 2017-06-20 17:05:53 -04:00
Ansariel e3a61bb4ce Merge LL viewer-release 5.0.6 2017-06-20 22:48:25 +02:00
Nat Goodspeed a3066b7375 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-06-20 16:11:33 -04:00
andreykproductengine f8254a9d78 MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows folder. 2017-08-30 19:57:02 +03:00
Brad Payne (Vir Linden) b8e2c58cec no-op edit to force a rebuild 2017-05-24 13:08:12 +01:00
Ansariel c7473d4b99 Merge asset-http 2017-04-19 23:16:13 +02:00
Brad Payne (Vir Linden) 9311cc89ea DRTVWR-434 - trivial code change to trigger TC rebuild, also slight improvement to a log message 2017-04-11 13:45:43 -04:00
Ansariel 915496bbea Merge viewer-vivox 2017-03-21 22:14:02 +01:00
Oz Linden 0a7fd3686a Look for logcontrol-dev.xml in the user settings directory 2017-02-27 09:52:50 -05:00
Nicky 6d3df79ea9 Merge #3 with lgpl. 2017-02-06 12:07:45 +01:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Nat Goodspeed 1df282efa1 DRTVWR-418: Fix streamtools test.
When std::istream::good() returns false, presumably we can no longer rely on
get() returning valid data. Certain streamtools tests were assuming that get()
would return the empty string at EOF, but in fact it appears that it left the
previous buffer contents unmodified.
2016-12-19 15:58:52 -05:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
Nat Goodspeed 704c53b3c5 MAINT-5232: Merge up to VLC viewer from viewer-release 2016-10-11 10:59:17 -04:00
Nicky d7a0835432 Merge. 2016-09-26 21:12:34 +02:00