Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-06-28 | SL-17379 More complete integration of material asset type | Dave Parks | |
2022-03-01 | Merge branch 'master' (DRTVWR-557) into DRTVWR-546 | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py | |||
2021-12-15 | DRTVWR-546 merge up to 6.5.2 | Dave Houlton | |
2021-12-15 | Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint | Andrey Kleshchev | |
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount | |||
2021-11-30 | SL-16119 Viewer should now direct IM 2 Email setting to web | Mnikolenko Productengine | |
2021-11-16 | DRTVWR-546 merge in master v6.5.1 | Dave Houlton | |
2021-11-16 | Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/settings.xml | |||
2021-11-16 | Merge branch 'master' into DRTVWR-534 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/VIEWER_VERSION.txt | |||
2021-11-16 | Merge branch 'master' into DRTVWR-519 | Andrey Lihatskiy | |
# Conflicts: # README.md | |||
2021-11-16 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp | |||
2021-10-28 | SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵ | Dave Parks | |
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton | |||
2021-10-22 | merge | Brad Payne (Vir Linden) | |
2021-10-07 | SL-16024: Return shared_ptr from LLInstanceTracker::getInstance(). | Nat Goodspeed | |
It feels wrong to return a dumb LLInstanceTracker subclass* from getInstance() when we use std::shared_ptr and std::weak_ptr internally. But tweak consumers to use 'auto' or LLInstanceTracker::ptr_t in case we later revisit this decision. We did add a couple get() calls where it's important to obtain a dumb pointer. | |||
2021-09-29 | SL-15999 - noninteractive sessions should quit cleanly when they get a close ↵ | Brad Payne (Vir Linden) | |
message. Removed some possible crashes | |||
2021-09-27 | SL-15999 - noninteractive: debugging run issues, suppress AFK/Away pose | Brad Payne (Vir Linden) | |
2021-09-27 | SL-15999 - removed kludgy run disablement, needs better fix | Brad Payne (Vir Linden) | |
2021-09-21 | SL-15999 - try to force non-interactive agents to always start out standing | Brad Payne (Vir Linden) | |
2021-08-20 | DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵ | Callum Prentice | |
internal repo to public one. | |||
2021-06-25 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llinventorypanel.cpp | |||
2021-06-25 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-06-24 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2021-04-22 | Merge branch 'SL-14862' into DRTVWR-518-ui | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llstartup.cpp | |||
2021-04-06 | SL-14960 Add checkbox to turn off collision sound. | Mnikolenko Productengine | |
2021-03-11 | Merge branch 'SL-14862' into DRTVWR-527-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llviewerstats.cpp | |||
2021-03-10 | SL-14862 - use nested LLSD for widget info, condensed to the two leaf-most ↵ | Brad Payne (Vir Linden) | |
elements of the path. Simplified floater logging. | |||
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-527-maint | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-518-ui | 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' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
2021-02-25 | SL-14879 "Play sounds from gestures" should not affect own sounds | Andrey Kleshchev | |
2021-02-03 | Merge with Master after Viewer release | Callum Prentice | |
2021-02-01 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
2020-11-13 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
2020-11-11 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-10-15 | Merge branch 'SL-14081' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llviewerregion.cpp | |||
2020-10-14 | SL-14081 - changed debug level for one message | Brad Payne (Vir Linden) | |
2020-10-14 | SL-14081 - more teleport logging | Brad Payne (Vir Linden) | |
2020-10-14 | SL-14081 - more detailed logging of teleport process | Brad Payne (Vir Linden) | |
2020-09-28 | Merge with tip of Release | Callum Prentice | |
2020-09-28 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml | |||
2020-09-24 | Complete the change from lldiskcache -> llfilesystem and then addition of ↵ | Callum Prentice | |
new lldiskcache implementation | |||
2020-09-23 | SL-13824 Remove notification when both joining a group and leaving a group | Mnikolenko Productengine | |
2020-09-23 | SL-13824 Remove notification when joining a group | Mnikolenko Productengine | |
2020-09-16 | Renamed the references to LLVFile and llvfile.* source code plus cmake ↵ | Callum Prentice | |
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more | |||
2020-09-16 | First part of change to remove LLVFS from the Viewer. Consists of code ↵ | Callum Prentice | |
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. | |||
2020-08-18 | Merge branch 'master' 6.4.8 into DRTVWR-497 | Dave Houlton | |
2020-08-18 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp | |||
2020-07-09 | Additional logging for SL-13397 | Andrey Kleshchev | |