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
1a92e392ea
message_template.msg to agree with master-message-template
2025-03-17 13:01:47 -07:00
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
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
ab87978cbc
1836 dont store texture in system memory unless absolutely necessary ( #1843 )
...
* #1836 Texture memory usage overhaul. Much decrufting
- don't keep a copy of textures in system memory
- use GPU to downrez textures instead of reloading from cache
- use GPU to generate brightness/darkness bumpmaps
2024-06-27 13:12:43 -05:00
14af436ce5
Fix build
2024-06-21 20:51:02 +02:00
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
a52391d582
Fixed incomplete merge in message_template.msg.sha1
2024-06-20 14:40:14 -07:00
5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07:00
8b747cee18
BOOL to bool
2024-05-06 16:49:24 -05:00
0ae8bbaf5d
Checkpoint WebRTC Voice
2024-02-08 18:34:00 -08:00
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
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
516d7a890d
Add EOL, hopefully make pre-commit happy
2024-01-05 00:21:14 +00:00
3777dbb3d6
More sl-20635 - moved new attachment data to AvatarAppearance message
2023-12-08 23:57:40 +00:00
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
e3e1d42ab3
SL-20229 update message template hash
2023-09-11 09:31:16 -05:00
455bbcf742
SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides
2023-08-29 16:42:55 -05:00
69fd209c83
SL-13313 Updated message_template.msg.sha1
2021-08-31 22:27:45 +03:00
c8562a5477
Update message template hash
2021-01-17 13:36:02 +01:00
6305dc1ed8
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 13:33:56 +01:00
71ba69e82a
SL-13313 Support RegionInfo5 block in RegionInfo message, and add log message
2021-01-12 16:22:17 +02:00
218e719d24
Merge viewer-eep
2018-12-13 21:14:20 +01:00
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
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
9735854226
Merge Firestorm LGPL
2018-11-16 18:10:32 +01:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
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
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
74957676fc
SL-694 - message changes for ObjectAnimation, more logging to validate behavior
2017-06-05 20:22:59 +01:00
55612611c6
SL-694 - stub support for ObjectAnimation message type
2017-05-30 22:03:43 +01:00
c437e17160
Sync message template with master
2017-05-24 09:56:11 +02:00
dcac0dce59
Merge viewer-bear
2017-05-07 13:11:50 +02:00
880be86cf2
MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners.
2017-03-10 15:07:55 -08:00
4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
6539fe4a67
SL-92 WIP - track appearance message timing
2014-12-16 09:14:18 -05:00
c9981ec59c
SL-92 WIP - hover height communicated via appearance messages.
2014-12-08 13:12:28 -05:00
d06a0217d9
Merge LL 3.7.26
2015-03-23 12:29:56 -07:00
73b277b83b
Fixed windows line endings
2013-12-09 13:47:41 -08:00
09964ec6ed
Created an experience specific permissions dialog.
2013-09-24 19:10:43 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
87833a2485
Fixed issues with mixed grids - new message blocks now variable
2012-08-27 17:37:34 -04:00
64d9705ae2
Expanding region flags to 64 bits. Adding region protocol flags
2012-08-17 03:56:38 +00:00
Ansariel