summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2021-03-09This 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-08Revert "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-02-03Merge with Master after Viewer releaseCallum Prentice
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-10-15Merge branch 'SL-14081' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llviewerregion.cpp
2020-10-14SL-14081 - changed debug level for one messageBrad Payne (Vir Linden)
2020-10-14SL-14081 - more teleport loggingBrad Payne (Vir Linden)
2020-10-14SL-14081 - more detailed logging of teleport processBrad Payne (Vir Linden)
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed 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-16First 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-18Merge branch 'master' 6.4.8 into DRTVWR-497Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-07-09Additional logging for SL-13397Andrey Kleshchev
2020-07-06SL-13466 Script permission question was not throttled correctly for some ownersAndrey Kleshchev
2020-06-16Additional logging for SL-13397Andrey Kleshchev
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-28Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-02-21Merge master (v 6.3.8) into DRTVWR-440Dave Houlton
2020-02-21mergeBrad Payne (Vir Linden)
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-16mergeBrad Payne (Vir Linden)
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-20SL-10499 - handle package info from benefits serviceBrad Payne (Vir Linden)
2019-11-15SL-11898 Hi-res snapshots do not support UI and HUDs and should not show themandreykproductengine
2019-11-15SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. ↵Brad Payne (Vir Linden)
Group-related costs and limits via benefits.
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Downstream merge from lindenlab/viewer-servalAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-16mergeBrad Payne (Vir Linden)
2019-10-15Merge from viewer-releaseandreykproductengine
2019-10-07SL-12024 Remove 'Estate warning' message and show just region name insteadmaxim_productengine
2019-09-27SL-12024 [EEP] UI should indicate that the Environment tab is an estate-wide ↵maxim_productengine
setting.
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-10-14SL-12067 Don't allow to send L$ gifts to Null UUIDmaxim_productengine
2019-07-22SL-10453 Unhelpful error message when trying to join a group you are already ↵andreykproductengine
a member of
2019-07-12Better logging for SL-10786andreykproductengine
2019-06-27SL-11454 Exception for muted objects, such offers should get declinedandreykproductengine
2019-06-26SL-11454 Missed variableandreykproductengine
2019-06-26SL-11454 Dismissing group notice should move attachment to trashandreykproductengine
2019-06-25SL-11454 Discarding should accept items to trashandreykproductengine
2019-06-19DRTVWR-493 LLFollowCamMgr to singletonandreykproductengine
2019-06-12SL-11402 Last session image should be saved as pngandreykproductengine
2019-06-12SL-11402 Save last session image per gridandreykproductengine
2019-05-08Fix merge fail.Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-02-05SL-10466 Viewer throwing misleading notificationandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 12:21:15 +0000