Commit Graph

10 Commits (c513ebb777b5345416683404454125cd94de838c)

Author SHA1 Message Date
Ansariel 25b7fd4fa9 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/CMakeLists.txt
#	indra/newview/llspeakers.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicewebrtc.cpp
2024-08-10 13:04:14 +02:00
Andrey Kleshchev ae7f7cd670 Replace boost::shared_ptr with std in voice classes 2024-08-07 14:19:49 +03:00
Andrey Lihatskiy c95b4bf3ea Post-merge - trim trailing whitespace 2024-06-10 20:45:59 +03:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
RunitaiLinden 4710fcf167 SL-20456 Fix for probe updates stopping after opening personal lighting or editing a sky setting. 2023-10-23 16:10:10 -05:00
Andrey Kleshchev 811da7dbb1 SL-18629 WIP Replacing UDP creation messages with callback based AIS #2
findCategory and move_item_to_marketplacelistings
2023-03-10 19:32:47 +02:00
Andrey Kleshchev 0d793f4fa3 restored SL-14027 (merge conflict) 2021-04-29 21:13:21 +03:00
Andrey Lihatskiy 1416c4d5c2 Merged in marchcat/SL-13161 (pull request #375)
SL-13161 Leftover change

* SL-13161 Leftover change

Approved-by: Andrey Kleshchev
2020-11-13 17:51:41 +00:00
Andrey Kleshchev 9d2c405ee4 SL-13516 Move dupplicated functionality of evironment editors into separate class 2020-07-20 17:57:47 +03:00