summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-30SL-16119 Viewer should now direct IM 2 Email setting to webMnikolenko Productengine
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-10-28SL-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-22mergeBrad Payne (Vir Linden)
2021-10-07SL-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-29SL-15999 - noninteractive sessions should quit cleanly when they get a close ↵Brad Payne (Vir Linden)
message. Removed some possible crashes
2021-09-27SL-15999 - noninteractive: debugging run issues, suppress AFK/Away poseBrad Payne (Vir Linden)
2021-09-27SL-15999 - removed kludgy run disablement, needs better fixBrad Payne (Vir Linden)
2021-09-21SL-15999 - try to force non-interactive agents to always start out standingBrad Payne (Vir Linden)
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-06-25Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-22Merge branch 'SL-14862' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llstartup.cpp
2021-04-06SL-14960 Add checkbox to turn off collision sound.Mnikolenko Productengine
2021-03-10SL-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-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-09Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
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-03-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
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-28Merge branch 'master' into DRTVWR-518-uiAndrey 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-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-23SL-13824 Remove notification when both joining a group and leaving a groupMnikolenko Productengine
2020-09-23SL-13824 Remove notification when joining a groupMnikolenko Productengine
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 08:40:25 +0000