Commit Graph

1902 Commits (01d8e7e34706d19bd5faa4906abe41d0eaa37237)

Author SHA1 Message Date
Ansariel 01d8e7e347 Merge axon 2017-09-20 01:09:14 +02:00
Brad Payne (Vir Linden) 218584593a merge 2017-08-28 14:05:00 +01:00
Brad Payne (Vir Linden) a254ca8b44 merge 2017-08-28 14:03:26 +01:00
Oz Linden b3ceeb6d9c MAINT-7594: add platform name string and address size to login request for crash stats (and add request parameter logging at DEBUG) 2017-08-24 10:37:59 -04:00
Ansariel c8755750e1 Merge Firestorm LGPL 2017-08-04 18:25:48 +02:00
Brad Payne (Vir Linden) 912c8faf55 SL-731 - diagnostic displays for LOD, tri count 2017-07-29 14:48:43 +01:00
Ansariel e0778ce1a7 Disable MemoryFailurePreventionEnabled by default and disable some spammy warnings and notifications 2017-07-29 16:58:22 +02:00
Ansariel cd37cccb46 Backout the backout because Whirly wants it ;) 2017-07-29 16:54:58 +02:00
Ansariel 46ccf2ed0e Backed out changeset 38d2fe89e20e (Enable MemoryFailurePreventionEnabled by default for 32bit builds to throttle memory allocations when memory gets low (has no effect on 64bit builds)) because it seems to cause really bad effects 2017-07-29 16:43:34 +02:00
Ansariel d2b93c74f9 Merge Firestorm LGPL 2017-06-20 23:07:41 +02:00
AndreyL ProductEngine 270cd8ff15 Merged in lindenlab/viewer-release 2017-06-20 23:16:03 +03:00
Ansariel 305312f82f Merge Firestorm LGPL 2017-06-20 21:20:10 +02:00
Ansariel 5d84299cee Merge Firestorm LGPL 2017-06-19 21:23:53 +02:00
Ansariel af4b2031b0 Enable MemoryFailurePreventionEnabled by default for 32bit builds to throttle memory allocations when memory gets low (has no effect on 64bit builds) 2017-06-15 19:46:40 +02:00
Ansariel 099d988fe2 Merge viewer-neko 2017-05-25 22:49:53 +02:00
username = daianakproductengine c9f9e93889 MAINT-2060 Fixed Double Freeze when clicking on Help>About Second Life 2017-05-19 20:28:59 +03:00
Ansariel c7473d4b99 Merge asset-http 2017-04-19 23:16:13 +02:00
Ansariel 36c584eec1 Merge Firestorm LGPL 2017-04-19 22:43:15 +02:00
Brad Payne (Vir Linden) de5cbddf79 merge 2017-04-19 16:02:48 -04:00
Ansariel 7c41871639 Merge viewer-lynx 2017-04-14 12:42:28 +02:00
Mnikolenko Productengine f1e00870df MAINT-6980 FIXED Ctrl + Alt + Shift + B does not force a crash on mac 2017-03-28 11:42:17 +03:00
Brad Payne (Vir Linden) ca74323ee8 SL-409 - added version field = 2 to asset stats, made viewer-side metrics files exactly match the payload sent to simulator. 2017-03-21 08:56:30 -04:00
Ansariel afef92cafc Merge asset-http 2017-03-20 17:13:42 +01:00
Ansariel 824857c46e Vertex Array Objects are required in OpenGL core profile 2017-03-18 21:49:55 +01:00
Brad Payne (Vir Linden) e9c786ec60 SL-409 - fixes for viewer asset metrics. Copy and/or assignment of Recording objects is failing, changed to create LLSD blob earlier and just copy that. 2017-03-10 11:29:48 -05:00
Ansariel bff6a3af15 Merge viewer-neko 2017-02-23 09:02:58 +01:00
AndreyL ProductEngine 3c249e5d5f MAINT-7051 Release Notes url shouldn't include the EDU parameter 2017-02-15 14:52:33 +02:00
Ansariel aff32c33d8 Merge Firestorm LGPL 2017-02-03 00:31:50 +01:00
Ansariel 319a57ba1b Merge Firestorm LGPL 2017-02-02 22:29:05 +01:00
Ansariel 6534c4be0e Introduce VIEWER_GENERATION as default substitution for LL's viewer generation 2017-01-30 19:51:15 +01:00
Rider Linden a65e3385f1 Merge 2017-01-27 09:26:42 -08:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
Rider Linden cb73d43bf6 MAINT-7082: Clean up, remove log spam. 2017-01-26 15:50:26 -08:00
Rider Linden bab0ee6a3a MAINT-7082: max_idle_time unused. 2017-01-26 10:19:54 -08:00
Rider Linden 56f9cce8a1 MAINT-7082: Remove waiting loop in frame when textures queued for download in alternate thread. With debug spam for observation. 2017-01-25 15:58:38 -08:00
Ansariel d87fe23122 Merge Firestorm LGPL 2017-01-25 11:13:18 +01:00
Rider Linden 2fd9cd6f04 MAINT-7082: Clean up, remove log spam. 2017-01-26 15:50:26 -08:00
Rider Linden 344f8d8306 MAINT-7082: max_idle_time unused. 2017-01-26 10:19:54 -08:00
Rider Linden 6e0de951e4 MAINT-7082: Remove waiting loop in frame when textures queued for download in alternate thread. With debug spam for observation. 2017-01-25 15:58:38 -08:00
andreykproductengine f08e6b873c MAINT-7024 Release notes page was requested prior to proxy initialization. 2016-12-22 17:34:40 +02:00
Ansariel 8c083cf771 Merge Firestorm LGPL 2016-12-05 22:40:59 +01:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Ansariel 16acd2d20a Merge Firestorm LGPL 2016-12-04 14:05:44 +01:00
Ansariel 1f1ea62a40 Merge Firestorm LGPL 2016-12-04 12:44:37 +01:00
Kitty Barnett eb43f227bc Merged cleanly with RLVa tip 2016-12-03 20:34:36 +01:00
Kitty Barnett 5267e65dc1 Merged with RLVa fixes tip
--HG--
branch : RLVa
2016-12-03 20:25:11 +01:00
Kitty Barnett 0581c4749d Merged with Appearance-Misc tip
--HG--
branch : RLVa
2016-12-03 13:07:14 +01:00
Ansariel e2919977d6 Merge viewer-lynx 2016-11-30 11:15:04 +01:00
Ansariel aa25acc045 Merge Firestorm LGPL 2016-11-30 09:43:52 +01:00
Kitty Barnett 3361b63c15 [FIXED] RLVa can be enabled from the command prompt (bypassing user consent)
-> if detected force RLVa to disabled and inform the user

--HG--
branch : RLVa
2016-11-27 18:23:57 +01:00