summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
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-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
2019-08-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2019-07-03DRTVWR-493 LLAvatarNameCache to singletoneandreykproductengine
2019-06-19DRTVWR-493 LLCallDialogManager to singletonandreykproductengine
2018-04-10MAINT-8489 Remove/Cleanup LLIMInfoAndrey Kleshchev
2017-08-30MAINT-7760 FIXED Crash in LLViewerChatterBoxInvitation::post(..)Mnikolenko Productengine
2017-04-24MAINT-7340 FIXED Incoming IMs steal focus if "Open conversation window" ↵Mnikolenko Productengine
setting is enabled
2017-04-14MAINT-7320 Avatars without voice mute hould be able to start the callsAndreyL ProductEngine
2017-04-11MAINT-7243 Fixed Crash when creating IM session if failed to resolve nameandreykproductengine
2017-02-15MAINT-7118 Swapping legacy people API with new cacheandreykproductengine
2017-01-24MAINT-1322 Voice calls from users with muted text (but not voice) should be ↵AndreyL ProductEngine
received
2017-01-23MAINT-1322 IMs from users with muted voice (but not text) should be receivedAndreyL ProductEngine
2016-12-21MAINT-7020 llui/llfloater.cpp should not access settingsAndreyL ProductEngine
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-23Merge from Vivox RepoRider Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-09-18Set consistent terminology for yield/wait -> suspend for coroutines.Rider Linden
2015-08-25MergeRider Linden
2015-08-17merge changes for 3.8.3-releaseOz Linden
2015-07-10Backed out changeset bab1000e1b2d: restore 'selfless' changesNat Goodspeed
2015-07-07Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5Rider Linden