Ansariel
3bc189bda7
Merge Firestorm LGPL
2019-11-19 20:28:09 +01:00
Ansariel
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
andreykproductengine
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
Ansariel
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
andreykproductengine
37eb735ba7
Merged in lindenlab/viewer-release
2019-09-10 20:30:25 +03:00
andreykproductengine
e1451bb1d1
DRTVWR-493 Do not recreate proxy only to destroy it
2019-09-04 20:56:45 +03:00
Nat Goodspeed
5a72d34b76
Automated merge with file:///Users/nat/linden/viewer-catch
2019-08-12 09:58:08 -04:00
Nat Goodspeed
f0fa4f94a5
DRTVWR-493: Make catch_llerrs() a member of WrapLLErrs.
2019-08-12 08:26:51 -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
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
andreykproductengine
87be5f7997
SL-4150 Rename htonmemcpy
2019-07-24 16:58:24 +03:00
andreykproductengine
779b5627c5
DRTVWR-493 LLAvatarNameCache to singletone
2019-07-03 20:06:47 +03:00
Ansariel
8dfb7d571e
Merge viewer-neko
2019-04-24 21:05:58 +02:00
Ansariel
1852033461
Merge Firestorm LGPL
2019-04-17 18:55:57 +02:00
andreykproductengine
36be78e54f
SL-2797 SOCKS5 not working reliably
2019-04-17 18:24:42 +03:00
AndreyL ProductEngine
59457cfcfe
Merged in lindenlab/viewer-release (EAM)
2019-04-17 16:26:45 +03:00
Ansariel
ab03fd8e29
Merge Firestorm LGPL
2019-03-02 17:13:41 +01:00
Ansariel
c96314964a
Merge Firestorm LGPL
2019-03-01 17:36:52 +01:00
AndreyL ProductEngine
36cb6933e6
Merged in lindenlab/viewer-release
2019-03-01 02:24:00 +02:00
Ansariel
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
andreykproductengine
fa15830e02
SL-10291 Replace apr_atomic with standard C++11 functionality
2019-01-15 18:31:17 +02:00
andreykproductengine
346fc435f1
SL-10291 cleanup-mutex
2019-01-17 01:53:27 +02:00
andreykproductengine
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
AndreyL ProductEngine
e4f6e7d842
Merged in lindenlab/viewer-release and incremented viewer version to 6.2.0
2019-03-01 20:03:14 +02:00
Ansariel
3fcc9d9d98
Merge viewer-estate-access
2019-01-02 14:46:39 +01:00
Ansariel
8b6392c0aa
Merge viewer-bugsplat
2018-12-16 13:04:08 +01:00
Nat Goodspeed
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
AndreyL ProductEngine
88605685b0
Merged in lindenlab/viewer-release
2018-11-14 22:52:16 +02:00
Ansariel
0e0d6b02cd
Merge Firestorm LGPL
2018-11-14 19:58:57 +01:00
Beq
22c7655573
FIRE-21669 & FIRE-11276: Fix for cross volume rename failures on Linux/Mac
2018-11-07 23:51:06 +00:00
Brad Payne (Vir Linden)
a84ee929a5
merge
2018-09-27 19:54:10 +01:00
AndreyL ProductEngine
4745de5f4b
Merged in lindenlab/viewer-release
2018-09-27 13:09:04 +03: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
6f7a3cdc74
Merge viewer-bear
2018-08-22 14:47:49 +02:00
andreykproductengine
50453b47fe
MAINT-5651 Froce-quit crash
2018-08-17 21:48:40 +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
Andrey Lihatskiy
5f432147e3
Merged lindenlab/viewer-release into default
2018-06-22 12:55:19 +03:00
Ansariel
3add6996ab
Merge Firestorm LGPL
2018-06-21 19:55:23 +02:00
Brad Payne (Vir Linden)
9d7b353cbb
merge
2018-06-21 15:49:53 +01:00
Ansariel
d799bec7d8
Merge Firestorm LGPL
2018-05-18 14:46:58 +02:00
Ansariel
dcedba081a
Merge viewer-bear
2018-05-18 09:43:11 +02:00
AndreyL ProductEngine
c9bb75e335
MAINT-7626 EOF fix
2018-05-18 02:51:09 +03:00
Ansariel
46fb5a7648
Merge viewer-neko
2018-05-09 23:03:43 +02:00
Ansariel
97028be9c8
Merge Firestorm LGPL Lynx
2018-05-08 20:29:47 +02:00
Ansariel
31a1ba1701
Merge Firestorm LGPL
2018-05-08 18:31:13 +02:00
Ansariel
a2879b80a6
Merge Firestorm LGPL
2018-05-08 17:13:44 +02:00
andreykproductengine
ff521c67ff
MAINT-7626 Update logging and comments, sync remaining transfer changes
2018-05-08 15:55:01 +03:00