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

96 Commits (bfb8ffbdaa7461b3e58d7803b13eb64eafa5792a)

Author SHA1 Message Date
Ansariel 36a8432909 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	scripts/messages/message_template.msg
#	scripts/messages/message_template.msg.sha1
 2025-03-19 15:00:25 +01:00
AndrewMeadows 1a92e392ea message_template.msg to agree with master-message-template 2025-03-17 13:01:47 -07:00
Ansariel 7c8a1dec41 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfloater.h
#	scripts/messages/message_template.msg.sha1
 2025-03-08 12:59:32 +01:00
Rider Linden 81df0476b5 Private Issue #297: Accept new flags in ScriptTeleportRequest message. Flags indicate if the world map should be opened and focused. 2025-02-26 16:02:24 -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 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 455bbcf742 SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides 2023-08-29 16:42:55 -05:00
Ansariel 6305dc1ed8 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-17 13:33:56 +01:00
Mnikolenko Productengine 71ba69e82a SL-13313 Support RegionInfo5 block in RegionInfo message, and add log message 2021-01-12 16:22:17 +02: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
Ansariel 9735854226 Merge Firestorm LGPL 2018-11-16 18:10:32 +01:00
Rider Linden 1d022e86c8 Merge 2018-11-14 11:19:33 -08: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 73b277b83b Fixed windows line endings 2013-12-09 13:47:41 -08: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
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Kitty Barnett b368a21202 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2013-02-04 21:06:34 +01: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
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08: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
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Oz Linden cf4d929888 STORM-956 update message template 2011-04-01 06:49:19 -04:00
Loren Shih 7687653871 Automated merge up from viewer-development 2010-10-20 12:18:33 -04:00
Matthew Breindel (Falcon) f0d3cfc7bb Unix EOL 2010-07-09 17:48:27 -07:00
Matthew Breindel (Falcon) 3733337011 Gravity, Friction, Restitution, Density now work with simulator. 2010-07-09 17:47:58 -07:00
Karl Stiefvater (qarl) 2530b057bb added new physics parameters to prims 2010-07-01 17:18:55 -05:00
James Cook 71dfe17fd1 Updated to latest MoneyBalanceReply message format 2010-04-02 09:45:17 -07:00
James Cook 7381679cd0 Add TransactionInfo to MoneyBalanceReply, unpack test data 2010-04-01 10:15:37 -07:00
Matthew Breindel (Falcon) b2381a039d DEV-47845 Cleaned up names. 2010-03-31 17:35:26 -07:00
Matthew Breindel (Falcon) 92257b55a4 DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so if it breaks a build, just revert to the previous changeset. 2010-03-26 18:23:05 -07:00