summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
2024-05-16Merge tag '7.1.7-release'Erik Kundiman
source for viewer 7.1.7.8974243247
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-25Merge tag '7.1.6-release'Erik Kundiman
source for viewer 7.1.6.8745209917
2024-04-24Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
2024-01-11SL-20798 use appropriate checkMnikolenko Productengine
2024-01-11SL-20798 FIXED Crash at LLIMMgr::addMessageMaxim Nikolenko
2023-10-26Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-10-25Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp
2023-10-19SL-20504 Chat history crashes on shutdownAndrey Kleshchev
2023-07-19Include standard library array headerErik Kundiman
as it's not implied on some platforms that std::array would be unrecognised.
2023-06-05SL-18837: #include <array> in several sources that need it.Nat Goodspeed
It seems we're no longer implicitly inheriting <array> from some other [set of] header file[s]. Where we use std::array, bring it in explicitly.
2023-03-23SL-19462 Declare the FetchGroupChatHistory setting in the codeAndrey Lihatskiy
to make it accessible after updating the viewer
2023-03-06SL-19346 PERMISSION_DEBIT remove warning for Linden owned contentAndrey Kleshchev
2023-02-13SL-18268 - Viewer update to read group chat history.simon
Feature described at https://community.secondlife.com/blogs/entry/12652-coming-soon-to-a-viewer-near-you-group-chat-history/
2023-02-02Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
2023-01-12DRTVWR-573 add missed argumentAndrey Lihatskiy
2023-01-12DRTVWR-573 post-merge buildfixAndrey Lihatskiy
2023-01-12Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llagent.cpp # indra/newview/llimview.cpp # indra/newview/llimview.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmediasettingsgeneral.cpp # indra/newview/pipeline.cpp
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-10-27DRTVWR-570 Mac build fix: unused variables cleanupAndrey Lihatskiy
2022-10-27SL-18157 Allow translation services to work in IM and group messagingMnikolenko Productengine
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-22Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-09-16SL-18119 - UIUsage logs for some common operationsBrad Payne (Vir Linden)
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-17SL-17973 updated inappropriate argMnikolenko Productengine
2022-08-17SL-17973 FIXED region name is not shown in the IM chatMnikolenko Productengine
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey 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
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2021-11-05SL-16320 Remove references to AvaLine from the viewerAndrey Kleshchev
2021-10-20SL-16184 FIXED Frame stall when friend comes online.Mnikolenko Productengine
2021-10-11SL-15079 Fix group recognitionAndrey Kleshchev
In god mode isInGroup always returns true even if id belongs not to a group, but to an agent. But for some cases function is used to determine if session is a group or an agent.
2021-04-30Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-04-27SL-15079 Fix odd group chat messagesAndrey Kleshchev
For god mode isInGroup was returning 'true' regardles of session id being group or agent id
2021-02-11SL-12795 Fix log session name not updatingAndrey Kleshchev
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-01-21SL-14728 Added data validation into incoming call dialogAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-08-01SL-12795 Fix existance of multiple chatlog files after name changeAndrey Kleshchev
2020-07-06SL-13529 FIXED CHUI floater switches IMs (Local chat to group IM to another ↵Mnikolenko Productengine
group IM)
2020-07-01SL-13525 FIXED If a blocked user is first to chat in a group IM session, ↵Mnikolenko Productengine
that group IM will not open even if unblocked people chat.
2020-03-19SL-12871 'Only Friends and Groups can call or IM me' setting should be ↵Mnikolenko Productengine
account based.
2020-03-17SL-12860 FIXED Enabling 'Only Friends and Groups can call or IM me' still ↵Mnikolenko Productengine
plays New Conversation sound
2020-03-10SL-12503 FIXED Voice notification isn't displayed near the "Speak" buttonmaxim_productengine
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-08-21SL-11753 FIXED Group & Resident with the same name share chat history.maxim_productengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 23:23:37 +0000