Ansariel
|
7fdc689a85
|
Merge viewer-eep
|
2019-03-21 20:54:50 +01:00 |
|
Graham Linden
|
898c9f4421
|
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
|
2019-03-13 13:21:48 -07:00 |
|
Ansariel
|
9735854226
|
Merge Firestorm LGPL
|
2018-11-16 18:10:32 +01:00 |
|
Rider Linden
|
1d022e86c8
|
Merge
|
2018-11-14 11:19:33 -08:00 |
|
Ansariel
|
1733550573
|
Merge viewer-eep
|
2018-09-22 00:42:04 +02:00 |
|
Ansariel
|
c1f3b20f55
|
Merge axon
|
2018-06-20 19:07:46 +02:00 |
|
Brad Payne (Vir Linden)
|
edf6795eda
|
SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output
|
2018-06-13 21:49:24 +01:00 |
|
Brad Payne (Vir Linden)
|
430f9420cf
|
SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues
|
2018-06-07 22:18:15 +01:00 |
|
Ansariel
|
5560f13b4b
|
Merge axon
|
2018-06-07 19:15:42 +02:00 |
|
Brad Payne (Vir Linden)
|
2a2046fd07
|
merge
|
2018-06-05 22:44:04 +01:00 |
|
Brad Payne (Vir Linden)
|
3fcf7a32ee
|
SL-915 - incremental updates to dynamic bounding box, setting to control detail.
|
2018-06-05 15:35:21 +01:00 |
|
Ansariel
|
acfe7e625e
|
Merge Firestorm LGPL
|
2018-06-01 22:10:21 +02:00 |
|
Graham Linden
|
37e8fd20c3
|
Merge to 5.1.6
|
2018-06-01 15:34:21 +01:00 |
|
Graham Linden graham@lindenlab.com
|
439273c9c1
|
Merge
|
2018-05-23 01:16:12 +01:00 |
|
Ansariel
|
d799bec7d8
|
Merge Firestorm LGPL
|
2018-05-18 14:46:58 +02:00 |
|
Ansariel
|
3f331bb24c
|
Merge Firestorm LGPL
|
2018-05-18 10:32:56 +02:00 |
|
AndreyL ProductEngine
|
64b3473f49
|
Merged in lindenlab/viewer-release
|
2018-05-18 03:02:44 +03:00 |
|
Graham Linden graham@lindenlab.com
|
0d7fa932d5
|
Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch).
Put in nSight debug support.
|
2018-04-20 18:14:29 +01:00 |
|
Brad Payne (Vir Linden)
|
7a006ea3a2
|
merge
|
2018-05-18 18:40:36 +01:00 |
|
Ansariel
|
5d924483a8
|
Merge viewer-cougar
|
2018-03-02 15:00:48 +01:00 |
|
Brad Payne (Vir Linden)
|
9f8c6ace4a
|
merge
|
2018-03-02 13:00:18 +00:00 |
|
Ansariel
|
c8e654c61d
|
Merge axon
|
2018-03-02 11:04:21 +01:00 |
|
Ansariel
|
9948fe9cc6
|
Merge Firestorm LGPL
|
2018-03-02 11:01:50 +01:00 |
|
AndreyL ProductEngine
|
af9069edbf
|
Merged in lindenlab/viewer-release
|
2018-03-02 00:47:08 +02:00 |
|
Brad Payne (Vir Linden)
|
3f9b3e01b9
|
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
|
2018-02-21 22:02:34 +00:00 |
|
Ansariel
|
999163b3f5
|
Merge viewer-neko
|
2018-02-12 21:45:05 +01:00 |
|
Ansariel
|
ec33358c85
|
Merge viewer-bear
|
2018-02-12 21:33:11 +01:00 |
|
andreykproductengine
|
0d40ac2ed9
|
MAINT-8258 Don't show sculpty until it is loaded or load fails
|
2018-02-07 20:41:53 +02:00 |
|
andreykproductengine
|
3b4ae3fe52
|
MAINT-8269 Crahes in cacheOptimize()
|
2018-02-05 16:52:13 +02:00 |
|
andreykproductengine
|
bdc9a93bc9
|
MAINT-8269 Crahes in cacheOptimize()
|
2018-02-05 16:52:13 +02:00 |
|
Ansariel
|
89e753a81d
|
Merge Firestorm LGPL
|
2018-01-17 21:20:40 +01:00 |
|
Brad Payne (Vir Linden)
|
e36745eb98
|
merge
|
2018-01-17 16:06:27 +00:00 |
|
Ansariel
|
0b6176dea9
|
Merge Firestorm LGPL
|
2018-01-25 21:57:38 +01:00 |
|
Ansariel
|
f727126c95
|
Merge viewer-bear
|
2018-01-25 21:55:38 +01:00 |
|
Ansariel
|
f6e3684f6e
|
Merge Firestorm LGPL
|
2018-01-17 12:07:54 +01:00 |
|
AndreyL ProductEngine
|
57a99273ed
|
Merged in lindenlab/viewer-release
|
2018-01-17 03:20:12 +02:00 |
|
Ansariel
|
98569f84a2
|
Merge viewer-neko
|
2018-01-13 19:11:09 +01:00 |
|
andreykproductengine
|
c56298d4ba
|
MAINT-8022 Make unzip silent yet include failure reason into output
|
2018-01-03 16:30:57 +02:00 |
|
Ansariel
|
e7715f7a31
|
Merge Firestorm LGPL
|
2017-11-30 20:33:07 +01:00 |
|
Brad Payne (Vir Linden)
|
5c7f27562d
|
merge
|
2017-11-29 23:40:12 +00:00 |
|
Ansariel
|
d1f365d81d
|
Merge Firestorm LGPL
|
2017-11-29 23:43:03 +01:00 |
|
Nat Goodspeed
|
e3a2c5e321
|
DRTVWR-418: Merge from latest viewer-release
|
2017-11-29 14:47:09 -05:00 |
|
Ansariel
|
c606bc3492
|
Merge viewer-lynx
|
2017-11-12 12:28:28 +01:00 |
|
Ansariel
|
8821f554e5
|
Undo crash fix in LLProfile destructor for upcoming fix from LL
|
2017-11-07 11:23:54 +01:00 |
|
andreykproductengine
|
fec6bbddc3
|
MAINT-7974 Fixed LLProfile crash(error) caused by thread unsafe variable
|
2017-11-03 20:30:47 +02: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 |
|
Ansariel
|
01d8e7e347
|
Merge axon
|
2017-09-20 01:09:14 +02:00 |