Ansariel
|
830eeaa6ff
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llface.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewertexturelist.cpp
|
2024-08-21 00:46:46 +02:00 |
|
Brad Linden
|
68f712615f
|
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
|
2024-08-20 09:44:14 -07:00 |
|
Brad Linden
|
5f26ba8014
|
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
# indra/newview/llpanelpeople.cpp
|
2024-08-15 09:41:54 -07:00 |
|
Andrey Kleshchev
|
ab86e77818
|
viewer-private#260 The 'Speak' button looks disabled during IM voice chat
p2p channels was reusing obsolete channel info
|
2024-08-14 00:44:39 +03:00 |
|
Rye Mutt
|
ac75cd98fc
|
Fix null region pointer crash in LLIMView
|
2024-08-09 22:55:08 +03:00 |
|
Ansariel
|
e17c906698
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llcontrolavatar.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
|
2024-07-22 20:58:53 +02:00 |
|
Rye Mutt
|
dbc7704a4a
|
Fix null region pointer crash in LLIMView
|
2024-07-22 11:02:09 -04:00 |
|
Brad Linden
|
3e4b23539c
|
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
# autobuild.xml
# indra/newview/llvoicechannel.cpp
|
2024-07-17 14:35:17 -07:00 |
|
Ansariel
|
76f2b1f48c
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llfloaterspellchecksettings.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
|
2024-07-16 10:44:38 +02:00 |
|
Andrey Kleshchev
|
94ef434cbf
|
#1932 Fix a case where an IM toast wasn't displayed
|
2024-07-10 14:24:55 +03:00 |
|
Ansariel
|
088cc2ea35
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
|
2024-07-09 02:25:42 +02:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02:00 |
|
Ansariel
|
9a2b83b294
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/llmessage/CMakeLists.txt
# indra/llmessage/llfiltersd2xmlrpc.cpp
# indra/newview/lldebugview.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llslurl.cpp
# indra/newview/llsurface.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llworld.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
# scripts/messages/message_template.msg.sha1
|
2024-07-02 18:08:57 +02:00 |
|
Brad Linden
|
35f4de5ebe
|
Merge remote-tracking branch 'origin/release/webrtc-voice' into develop
# Conflicts:
# indra/newview/llvoicechannel.cpp
|
2024-06-28 12:50:59 -07:00 |
|
Roxie Linden
|
0f2bb1bd83
|
Make the webrtc viewer work for vivox adhoc/group calls.
There was an issue on the release grid where old-style credentials
were being sent over and the webrtc viewer wasn't dealing with them properly.
|
2024-06-26 12:53:49 -07:00 |
|
Roxie Linden
|
454821bb59
|
#1806 - crash in initVoiceChannel
|
2024-06-25 18:30:18 -07:00 |
|
Ansariel
|
364a14a8aa
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llprofilercategories.h
|
2024-06-21 22:45:12 +02:00 |
|
Ansariel
|
e2c7a4d245
|
Fix some BOOL oversights during WebRTC merge
|
2024-06-21 19:48:18 +02:00 |
|
Ansariel
|
e33d2fad5f
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
|
2024-06-21 19:10:44 +02:00 |
|
Roxie Linden
|
5e60392c27
|
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
|
2024-06-13 14:59:28 -07:00 |
|
Ansariel
|
9e45c1e506
|
Fix issues resulting from b42f9d836b
|
2024-06-09 16:17:03 +02:00 |
|
Ansariel
|
a17fd2352a
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
|
2024-06-09 16:11:24 +02:00 |
|
Ansariel
|
b42f9d836b
|
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
|
2024-06-01 15:49:26 +02:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Ansariel
|
4b0ad849a9
|
Merge remote-tracking branch 'LL/project/webrtc-voice'
# Conflicts:
# autobuild.xml
# indra/cmake/WebRTC.cmake
|
2024-05-21 00:42:55 +02:00 |
|
Ansariel
|
3da533c5eb
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
|
2024-05-20 23:46:53 +02:00 |
|
Roxie Linden
|
3a212d9608
|
Merge branch 'spaces-merge' into roxie/webrtc-voice
|
2024-05-20 12:59:59 -07:00 |
|
Roxie Linden
|
ddbd1ab47e
|
More session shutdown cleanup
|
2024-05-19 02:30:45 -07:00 |
|
Roxie Linden
|
cfd358f933
|
WebRTC clients calling Vivox clients should handle P2P
|
2024-05-16 13:34:13 -07:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Roxie Linden
|
57b99aec74
|
Don't overwrite voice channel's credentials when retrieving the channel.
|
2024-05-13 18:40:00 -07:00 |
|
Roxie Linden
|
39d24e90b9
|
incoming p2p sessions for webrtc may not have names yet.
|
2024-05-13 12:36:07 -07:00 |
|
Ansariel
|
c2d3c47bad
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
|
2024-05-12 16:01:58 +02:00 |
|
Roxie Linden
|
27e4913b5c
|
Fix issue where groups/adhoc chats were named with the initiators display name
|
2024-05-10 09:36:38 -07:00 |
|
Ansariel
|
f0e4dcdaf6
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llthread.h
# indra/llmessage/llcachename.cpp
# indra/llui/lllineeditor.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llnotificationhandlerutil.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
|
2024-05-08 05:10:22 +02:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +02:00 |
|
Roxie Linden
|
4af9128db1
|
Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice
|
2024-05-06 16:40:12 -07:00 |
|
Ansariel
|
5e5edd78ed
|
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
|
2024-05-03 14:00:17 +02:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +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 |
|
Roxie Linden
|
57182b2ac0
|
tabbing
|
2024-04-28 19:39:23 -07:00 |
|
Roxie Linden
|
4c4d23acb0
|
Renegotiate voice if the voice server type has changed.
The server will send an update with new voice credentials
when another peer comes in requiring vivox, if the channel
was initially webrtc.
|
2024-04-26 21:31:06 -07:00 |
|
Ansariel
|
b527620dfc
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-24 19:53:03 +02:00 |
|
Ansariel
|
7a2070d795
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvovolume.cpp
|
2024-04-24 18:59:46 +02:00 |
|
Andrey Lihatskiy
|
85f2447b3d
|
Merge branch 'main' into marchcat/a-merge
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
|
2024-04-24 19:28:15 +03:00 |
|
Andrey Lihatskiy
|
428f21cf79
|
Merge branch 'main' into marchcat/x-merge
|
2024-04-24 18:45:54 +03:00 |
|
Roxie Linden
|
1a1af1ce29
|
Adjust logic for determine what voice server type to use.
|
2024-04-20 00:26:39 -07:00 |
|
Roxie Linden
|
b59ff9edc0
|
For p2p/adhoc/group calls, prefer voice server type based on what's running on the region
|
2024-04-19 18:52:32 -07:00 |