Ansariel
1772ae4c6c
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_preferences_chat.xml
2023-03-07 14:21:43 +01:00
Andrey Kleshchev
8032b2d72e
SL-19204 Crash at removeObserver
...
A lot of reports about crashes in voice's removeObserver with no indication of the cause, all MAC specific. By this point terminate should have been called and mVoiceModule should be null, yet callstaks suggest it isn't.
Commit clears LLVoiceClient beforehand to avoid the issue entirely, but issue lies elsewhere and 'voice' crash is just a symptom.
2023-02-17 00:51:18 +02:00
Ansariel
5f81627faf
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloateravatar.h
2022-12-12 22:11:54 +01:00
akleshchev
f7010e46af
SL-18778 Crash at LLVoiceClient::removeObserver ( #25 )
2022-12-06 04:37:07 +02:00
Ansariel
401fa5a4e4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-10-21 01:51:04 +02:00
Andrey Lihatskiy
26c8883bb7
Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-N
2022-09-22 19:13:13 +03:00
Brad Payne (Vir Linden)
827420e2fe
SL-18119 - bug fix
2022-09-21 20:58:34 +01:00
Brad Payne (Vir Linden)
3994101549
SL-18119 - more ViewerStats logs for NUX
2022-09-21 20:52:27 +01:00
Ansariel
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
Howard Stearns
4dfecb6e1a
SL-13297 - Change names to match coding standard.
2022-01-06 16:33:38 -08:00
Howard Stearns
bdd8a52dfe
SL-13297 - Record and use build version reported by SLVoice
2022-01-06 15:44:21 -08:00
Ansariel
d271062749
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 16:53:23 +02:00
Andrey Lihatskiy
6240168f24
Merge branch 'master' into DRTVWR-515-maint
2021-04-01 20:45:06 +03:00
Ansariel
7ca874a6e3
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-02 00:16:25 +01:00
Andrey Kleshchev
a059e0d2e5
SL-3136 Logout crash fixes from Ansariel Hiller
2021-01-22 23:01:58 +02:00
Ansariel
6c587d437d
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-02 08:17:58 +01:00
Andrey Kleshchev
47bd603ceb
SL-13733 One more vivox shutdown crash
...
Vivox was using dead pump
2020-11-25 18:09:54 +02:00
Ansariel
5e65f3dfc3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 16:54:23 +01:00
Andrey Kleshchev
74c3b7a0ee
Merged master (DRTVWR-507) into DRTVWR-514-keymappings
2020-11-11 22:16:04 +02:00
Ansariel
ebe141327c
Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer
2020-06-24 10:30:51 +02:00
andreykproductengine
2532a2ee9e
SL-6109 Conflict resolution
2020-06-23 14:48:03 +03:00
andreykproductengine
4df05c5a89
SL-6109 Keyaboard support ready
2020-06-23 14:48:02 +03:00
andreykproductengine
3633ccf1a1
SL_6109 Rebinding
2020-06-23 14:48:02 +03:00
andreykproductengine
b9294516fc
SL-6109 Implement keybindings
2020-06-23 14:48:02 +03:00
Ansariel
64f80748e7
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-18 21:50:17 +02:00
Andrey Kleshchev
deb1c21a7a
SL-13034 Last string in logs should say 'Goodbye'
...
Speaker volume saving was last instead of 'Goodbye'.
2020-05-13 19:45:42 +03:00
Ansariel
fd4b8a7bb1
Merge Firestorm LGPL
2019-11-12 18:45:02 +01:00
AndreyL ProductEngine
84f3b2865f
Merged in lindenlab/viewer-release
2019-11-12 00:39:07 +02:00
Ansariel
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
andreykproductengine
24a0601a50
DRTVWR-493 Reworked a number of inits
2019-08-13 20:19:46 +03:00
Ansariel
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
andreykproductengine
ba2429163a
SL-11592 [Win] Ability to bind extra mouse buttons for push to talk
2019-07-18 18:37:45 +03:00
Ansariel
467bde0e52
Merge viewer-lynx
2018-11-14 19:14:49 +01:00
Mnikolenko ProductEngine
6e94df418a
SL-9955 FIXED crash-on-exit in LLVivoxVoiceClient::removeObserver
2018-10-30 16:36:23 +02:00
Ansariel
412108a27d
Merge LL viewer-release 5.1.8
2018-08-22 09:29:07 +02:00
Oz Linden
30b8068c97
VOICE-50 VOICE-58: recover from SLVoice process exit automatically
2018-08-10 09:51:48 -04:00
Oz Linden
d47f604e63
VOICE-47: Disconnect from voice during teleport to prevent audio artifacts
2017-05-02 14:32:34 -04:00
Oz Linden
55ff21f58e
VOICE-47: Disconnect from voice during teleport to prevent audio artifacts
2017-05-02 14:32:34 -04:00
Ansariel
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
Oz Linden
c4b2bd36e0
coding style
2017-03-14 14:17:34 -04:00
Oz Linden
fa61272bd4
clean up use of mVoiceEnabled (rename the session member mVoiceActive)
2017-03-13 10:08:18 -04:00
Ansariel
e49e54ab3d
Shutdown speaker volume storage before CRT does it
2016-10-25 15:58:10 +02:00
Ansariel
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
Oz Linden
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
Ansariel
10b73565f2
Merge viewer-bear
2016-04-14 15:07:39 +02:00
Ansariel
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
Oz Linden
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
AndreyL ProductEngine
afcea0b8dc
MAINT-6304 FIXED Push-to-talk triggered with keyboard doesn't close the mic
2016-04-06 01:34:21 +03:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Nicky
c20277f2f5
Merge.
2015-12-21 20:52:46 +01:00