f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
91f9f2e9f7
DRTVWR-570 Mac build fix: unused variables cleanup
2022-10-27 23:08:09 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
26c8883bb7
Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-N
2022-09-22 19:13:13 +03:00
56e1db9c15
SL-18119 - UIUsage logs for some common operations
2022-09-16 17:09:55 +01:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
8e8c68720b
SL-17973 updated inappropriate arg
2022-08-17 20:12:09 +03:00
0191ee5f6f
SL-17973 FIXED region name is not shown in the IM chat
2022-08-17 14:50:03 +03:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# 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-03-01 13:41:42 +02:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
b6c7eee505
SL-16320 Remove references to AvaLine from the viewer
2021-11-05 21:01:45 +02:00
6ecf8f2c01
SL-16184 FIXED Frame stall when friend comes online.
2021-10-20 14:53:55 +03:00
e45d695cc8
SL-15079 Fix group recognition
...
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-10-11 19:35:46 +03:00
58b4afa0ba
Merge branch 'master' into DRTVWR-530-maint
2021-04-30 03:05:06 +03:00
c0fafd7973
SL-15079 Fix odd group chat messages
...
For god mode isInGroup was returning 'true' regardles of session id being group or agent id
2021-04-27 19:46:34 +03:00
0e3d8023dc
SL-12795 Fix log session name not updating
2021-02-11 18:49:11 +02:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master 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-02-01 22:28:15 +02:00
5629062ce7
SL-14728 Added data validation into incoming call dialog
2021-01-21 23:18:18 +02:00
1d458de949
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
32cb17e3bb
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# indra/newview/llgroupmgr.cpp
2020-09-28 22:24:12 +03:00
cc25193af9
SL-12795 Fix existance of multiple chatlog files after name change
2020-08-01 01:26:04 +03:00
c38199451b
SL-13529 FIXED CHUI floater switches IMs (Local chat to group IM to another group IM)
2020-07-06 11:31:02 +03:00
562c2bd1ec
SL-13525 FIXED If a blocked user is first to chat in a group IM session, that group IM will not open even if unblocked people chat.
2020-07-01 16:55:57 +03:00
6c41ea62ce
SL-12871 'Only Friends and Groups can call or IM me' setting should be account based.
2020-03-19 16:14:02 +02:00
a7b1749672
SL-12860 FIXED Enabling 'Only Friends and Groups can call or IM me' still plays New Conversation sound
2020-03-17 16:55:10 +02:00
5bc97f1fa3
SL-12503 FIXED Voice notification isn't displayed near the "Speak" button
2020-03-10 17:40:33 +02:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
5f731d84cb
Downstream merge from 494-maint-wassail
2019-11-12 02:37:15 +02:00
9773e06cc1
SL-11753 FIXED Group & Resident with the same name share chat history.
2019-08-21 16:22:43 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
779b5627c5
DRTVWR-493 LLAvatarNameCache to singletone
2019-07-03 20:06:47 +03:00
55670eef35
DRTVWR-493 LLCallDialogManager to singleton
2019-06-19 17:28:46 +03:00
980ebf5d94
MAINT-8489 Remove/Cleanup LLIMInfo
2018-04-10 15:59:21 +00:00
bcb3bea0a9
MAINT-7760 FIXED Crash in LLViewerChatterBoxInvitation::post(..)
2017-08-30 16:49:52 +03:00
a48da20140
MAINT-7340 FIXED Incoming IMs steal focus if "Open conversation window" setting is enabled
2017-04-24 15:49:25 +03:00
9791c704c9
MAINT-7320 Avatars without voice mute hould be able to start the calls
2017-04-14 18:54:47 +03:00
8f2981f0cf
MAINT-7243 Fixed Crash when creating IM session if failed to resolve name
2017-04-11 18:43:44 +03:00
605160d501
MAINT-7118 Swapping legacy people API with new cache
2017-02-15 20:40:03 +02:00
6b1245aa1e
MAINT-1322 Voice calls from users with muted text (but not voice) should be received
2017-01-24 18:00:13 +02:00
e2bb0c170e
MAINT-1322 IMs from users with muted voice (but not text) should be received
2017-01-23 19:51:58 +02:00
e48af9ba0f
MAINT-7020 llui/llfloater.cpp should not access settings
2016-12-21 06:57:49 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
5d897443a9
Merge from Vivox Repo
2015-11-23 13:04:01 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
96bb17f20b
Merge
2015-08-25 11:40:36 -07:00
fe2eefd913
merge changes for 3.8.3-release
2015-08-17 16:00:04 -04:00
efa9a0f99c
Backed out changeset bab1000e1b2d: restore 'selfless' changes
2015-07-10 19:30:10 -04:00
247eb0c9c3
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
2015-07-07 19:41:27 +01:00
Andrey Lihatskiy