Commit Graph

2311 Commits (f7ab3b2f4b3485d46f5a0a4ffcc8f4cb4cd6d4a2)

Author SHA1 Message Date
Ansariel d6147f3d16 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-18 20:18:32 +02:00
Nicky 9908402334 Do not include SLLog in Bugsplat. 2020-05-12 17:26:59 +02:00
Ansariel 2bf32c552b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-04-08 08:14:16 +02:00
Ansariel d4356d66fb FIRE-29427: Changes references from "V3" to "V[current Version]" 2020-04-01 20:28:03 +02:00
Ansariel 846d78345c Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer 2020-04-01 15:00:34 +02:00
Andrey Kleshchev 6620211bff SL-12911 Add Debug setting EnvironmentPersistAcrossLogin 2020-03-27 00:24:08 +02:00
Ansariel cb525012e7 Merge DRTVWR-440 2020-03-12 17:19:05 +01:00
Dave Houlton 7d94bcf729 DRTVWR-440 Add compile switch SHADER_CRASH_NONFATAL to prevent app exit on shader failure 2020-03-10 12:01:24 -06:00
Ansariel 5ea49864f7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-01-31 09:49:37 +01:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
Ansariel 9edad026f4 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-01-28 18:05:34 +01:00
Ansariel 7613e76fc2 Merge viewer-serval 2020-01-10 16:01:02 +01:00
Ansariel dc2a972024 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-01-08 17:45:46 +01:00
andreykproductengine 19caca91e9 SL-12486 Better data deletion 2020-01-07 00:52:04 +02:00
Nicky Dasmijn 1bcbf82734 Remove option of minidump type.
- With Bugsplat this option makes no sense.
- Even with the old minidump processor the option was barely useful.
2020-01-04 22:27:22 +01:00
Nicky f238377c80 Bake git rev. hash into the viewer. 2019-12-29 23:27:02 +01:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00
Ansariel da365b227e Merge Firestorm LGPL 2019-12-13 18:15:19 +01:00
Ansariel 3bc189bda7 Merge Firestorm LGPL 2019-11-19 20:28:09 +01:00
Ansariel 0b6b4c7097 Merge Firestorm LGPL 2019-11-15 19:05:26 +01:00
Dave Houlton cf9014602d Fix merge-related unitialized ptr deref crash on login 2019-11-14 16:26:37 -07:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
AndreyL ProductEngine 84f3b2865f Merged in lindenlab/viewer-release 2019-11-12 00:39:07 +02:00
Ansariel 6e340961c0 Merge viewer-neko 2019-10-30 18:05:01 +01:00
andreykproductengine 5591515f19 MAC build fix 2019-10-23 20:27:05 +03:00
andreykproductengine 1b4d5492c6 SL-11727 Fix build warnings 2019-10-23 16:37:15 +03:00
andreykproductengine 0c568bf799 SL-12164 crash on userQuit 2019-10-23 12:22:27 +03:00
Mnikolenko Productengine 7d7b60a9be SL-12168 FIXED crash on exit, if resetting camera was performed 2019-10-22 17:47:44 +03:00
andreykproductengine cc32c70518 SL-12164 attempt to close viewer on window init resulted in crash 2019-10-21 21:45:45 +03:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Ansariel 0cb17cd365 Merge Firestorm LGPL 2019-10-16 23:31:52 +02:00
Brad Payne (Vir Linden) c7747d2a1b merge 2019-10-16 22:24:03 +01:00
andreykproductengine af5c556270 Merge from viewer-release 2019-10-15 21:28:37 +03:00
Ansariel 6fa34eff70 Merge Firestorm LGPL 2019-10-14 18:06:42 +02:00
Ansariel 555115b818 Merge Firestorm LGPL 2019-10-09 22:40:57 +02:00
Ansariel e0004e744e Merge Firestorm LGPL 2019-10-09 22:09:22 +02:00
PanteraPolnocy 3dadd1a95b Changed phoenixviewer.com to firestormviewer.org in few applicable places
Obviously, search & replace (for XML files), plus some manual reviewing
2019-10-07 09:54:33 +02:00
Ansariel 9f005065d0 Merge Firestorm LGPL 2019-09-10 23:40:54 +02:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
Ansariel 438bb8c113 Merge viewer-neko 2019-09-10 20:03:09 +02:00
andreykproductengine 37eb735ba7 Merged in lindenlab/viewer-release 2019-09-10 20:30:25 +03:00
andreykproductengine e29b3605c3 SL-11315 Viewer asks to play media and retains selected choice 2019-09-05 17:15:57 +03:00
andreykproductengine 27d391b2bb SL-11868 Fix cache init after purge 2019-09-04 19:20:52 +03:00
Ansariel 4087c4c077 Merge Firestorm LGPL 2019-08-13 20:17:51 +02:00
andreykproductengine 24a0601a50 DRTVWR-493 Reworked a number of inits 2019-08-13 20:19:46 +03:00
andreykproductengine 3c552696bf DRTVWR-493 LLWearableType to LLParamSingleton 2019-08-12 22:56:15 +03:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
AndreyL ProductEngine c2660070ce SL-11716 Fixed crash on initializing LLUI 2019-08-10 03:09:30 +03:00
andreykproductengine adeee613c6 DRTVWR-493 LLRender2D to LLParamSingleton 2019-07-25 18:20:17 +03:00