livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,463 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

44 Commits (684bc1d1ead1b91c7adf25adeb00a95745fe02be)

Author SHA1 Message Date
Ansariel 684bc1d1ea Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/llcommon/llsys.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
 2024-06-21 19:46:51 +02:00
Brad Linden a52391d582 Fixed incomplete merge in message_template.msg.sha1 2024-06-20 14:40:14 -07:00
Roxie Linden 5e60392c27 Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice 2024-06-13 14:59:28 -07:00
RunitaiLinden 8b747cee18 BOOL to bool 2024-05-06 16:49:24 -05:00
Roxie Linden 0ae8bbaf5d Checkpoint WebRTC Voice 2024-02-08 18:34:00 -08:00
Ansariel a831237e29 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llimage/llimage.h
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	scripts/messages/message_template.msg.sha1
 2024-02-06 17:58:20 +01:00
simon 82d8b2a720 sl-20635 attempts at build fixes, added a few stray log messages about log file changes 2024-01-05 19:01:40 +00:00
simon 516d7a890d Add EOL, hopefully make pre-commit happy 2024-01-05 00:21:14 +00:00
simon 3777dbb3d6 More sl-20635 - moved new attachment data to AvatarAppearance message 2023-12-08 23:57:40 +00:00
Ansariel 0514918bed Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	scripts/messages/message_template.msg.sha1
 2023-09-21 18:34:10 +02:00
RunitaiLinden e3e1d42ab3 SL-20229 update message template hash 2023-09-11 09:31:16 -05:00
RunitaiLinden 455bbcf742 SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides 2023-08-29 16:42:55 -05:00
Andrey Kleshchev 69fd209c83 SL-13313 Updated message_template.msg.sha1 2021-08-31 22:27:45 +03:00
Ansariel c8562a5477 Update message template hash 2021-01-17 13:36:02 +01:00
Ansariel 218e719d24 Merge viewer-eep 2018-12-13 21:14:20 +01:00
Rider Linden 70ac8d9fa7 SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment. 2018-12-12 14:07:23 -08:00
Rider Linden 29130c5483 SL-10093: Client code to support experiences changing an environment. Handle generic messages with "commands" to be executed. 2018-11-20 10:59:38 -08:00
Ansariel 9735854226 Merge Firestorm LGPL 2018-11-16 18:10:32 +01:00
Ansariel 1733550573 Merge viewer-eep 2018-09-22 00:42:04 +02:00
Rider Linden b50d546d5f MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap 
MAINT-7703: Initial flags sent in message protocol for parcels
 2018-08-03 16:13:22 -07:00
Ansariel 01d8e7e347 Merge axon 2017-09-20 01:09:14 +02:00
Brad Payne (Vir Linden) 74957676fc SL-694 - message changes for ObjectAnimation, more logging to validate behavior 2017-06-05 20:22:59 +01:00
Brad Payne (Vir Linden) 55612611c6 SL-694 - stub support for ObjectAnimation message type 2017-05-30 22:03:43 +01:00
Ansariel c437e17160 Sync message template with master 2017-05-24 09:56:11 +02:00
Ansariel dcac0dce59 Merge viewer-bear 2017-05-07 13:11:50 +02:00
Rider Linden 880be86cf2 MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners. 2017-03-10 15:07:55 -08:00
Ansariel 4ce6691cf8 Merge viewer-xp_tools 2015-06-25 11:57:17 +02:00
simon a219cf1c98 Merge viewer-release 2015-04-15 15:07:13 -07:00
Brad Payne (Vir Linden) 6539fe4a67 SL-92 WIP - track appearance message timing 2014-12-16 09:14:18 -05:00
Brad Payne (Vir Linden) c9981ec59c SL-92 WIP - hover height communicated via appearance messages. 2014-12-08 13:12:28 -05:00
Tank_Master d06a0217d9 Merge LL 3.7.26 2015-03-23 12:29:56 -07:00
dolphin 09964ec6ed Created an experience specific permissions dialog. 2013-09-24 19:10:43 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Brad Payne (Vir Linden) 87833a2485 Fixed issues with mixed grids - new message blocks now variable 2012-08-27 17:37:34 -04:00
Don Kjer 64d9705ae2 Expanding region flags to 64 bits. Adding region protocol flags 2012-08-17 03:56:38 +00:00
Don Kjer dfce4c451c Added AppearanceData block to AvatarAppearance message 2012-08-02 22:54:01 +00:00
Kitty Barnett d5f93071b5 Merge with RLVa tip for viewer-sunshine 2013-02-15 19:26:00 +01:00
Cinders d145a7701f FIRE-8063: Add Open Region Settings panel to the Region Info floater for aurora-sim; Add IsInAuroraSim() to fsgridhandler 2012-10-28 14:23:32 -06:00
Dave Parks 675e0cfd99 Use tcmalloc from 3p-google-perftools on windows 2011-04-11 14:12:49 -05:00
Oz Linden a03f6997d8 update message template hash to correct value 2011-04-01 12:08:03 -04:00
Kelly Washington 6540ccd307 Updated message template hash. 2011-03-31 16:15:48 -07:00
Kelly Washington f360ce118d Add template .sha1 2011-03-03 12:14:10 -08:00