Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-04-01 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2021-04-01 | Merge branch 'master' into DV525-merge-6.4.18 | Dave Houlton | |
2021-04-01 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/lltoolpie.cpp | |||
2021-04-01 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-04-01 | Merge branch 'master' into DRTVWR-520-apple-notarization | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml | |||
2021-04-01 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-04-01 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-17 | SL-14541 follow-up xcode buildfix | Andrey Lihatskiy | |
2021-03-17 | SL-14541 removed breakpad, win_crash_logger, updated zlib | Andrey Kleshchev | |
2021-03-13 | SL-14961 Coroutine crash was not reported to bugsplat | Andrey Kleshchev | |
2021-03-10 | Merge branch 'master' v6.4.17 into DRTVWR-525 | Dave Houlton | |
2021-03-09 | This set of changes reverts the merge with master (git revert c83e740) and ↵ | Callum Prentice | |
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal | |||
2021-03-09 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-520-apple-notarization | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-08 | Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵ | Brad Payne (Vir Linden) | |
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5. | |||
2021-03-02 | Merge branch 'master' v 6.4.15 into DRTVWR-525 | Dave Houlton | |
2021-03-02 | SL-12122 - removed frametime spikes in windows build caused by unnecessary ↵ | Brad Payne (Vir Linden) | |
call to GetPerformanceInfo() | |||
2021-03-02 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-520-apple-notarization | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2021-02-28 | xcode buildfix | Andrey Lihatskiy | |
2021-01-21 | SL-14597 Fixed deprecated function and added signal handling | Andrey Kleshchev | |
Signal handling is ugly, but so far that's the only option that works Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com> Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> | |||
2021-01-21 | Merged in xcode-buildfix (pull request #442) | Andrey Lihatskiy | |
xcode 12.3 buildfix * xcode 12.3 buildfix Approved-by: Andrey Kleshchev | |||
2021-01-18 | SL-14597 ensure that uris don't crash viewer | Andrey Kleshchev | |
2021-01-11 | SL-2202 Add exception handling around boost::regex_match() calls in the viewer | Mnikolenko Productengine | |
2020-12-01 | SL-14347 Crash at ChoosePixelFormat SEH | Andrey Kleshchev | |
2020-11-16 | SL-14340 Fix crash on llerror's recorders | Andrey Kleshchev | |
2020-11-13 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.cpp # indra/newview/llenvironment.cpp | |||
2020-11-11 | Merge branch 'master' 6.4.12 into DRTVWR-510 | Dave Houlton | |
2020-11-11 | Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp | |||
2020-11-11 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-11-11 | Merged master (DRTVWR-507) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-10-26 | SL-14004 Coalesce viewer's LLError::Settings and Globals | Andrey Kleshchev | |
2020-10-26 | SL-13979 Crash of logging system at LLError::Settings::getInstance() | Andrey Kleshchev | |
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks | |||
2020-10-19 | DRTVWR-510 clean up obsolete downstream-from-mDebugGPU code | Dave Houlton | |
2020-10-08 | DRTVWR-510 remove all LL_SOLARIS conditionals | Dave Houlton | |
2020-09-25 | SL-13034 Last string in logs should say 'Goodbye' | Andrey Kleshchev | |
These logs were not logging for very long due to supressed logging system, no point showing them now | |||
2020-09-25 | SL-13979 Crash of logging system at LLError::Settings::getInstance() | Andrey Kleshchev | |
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks | |||
2020-09-11 | Effective rename of DRTVWR-506-simple since there is no way to rename a ↵ | Callum Prentice | |
branch. Cloned canonical viewer into DRTVWR-519, copied over the files that changed from DRTVWR-506-simple and pushed back. Once I am satisfied everything is correct, DRTVWR-506-simple will be removed | |||
2020-08-25 | SL-13843 FIXED URL gets changed when opened in the internal web browse | Mnikolenko Productengine | |
2020-08-24 | SL-10297 merged 6.4.7 | Oz Linden | |
2020-08-18 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2020-08-11 | Merged master into DRTVWR-514-keymappings | Andrey Kleshchev | |