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
71ba69e82a
SL-13313 Support RegionInfo5 block in RegionInfo message, and add log message
2021-01-12 16:22:17 +02: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
1d022e86c8
Merge
2018-11-14 11:19:33 -08: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
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
880be86cf2
MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners.
2017-03-10 15:07:55 -08: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
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
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
dfce4c451c
Added AppearanceData block to AvatarAppearance message
2012-08-02 22:54:01 +00:00
675e0cfd99
Use tcmalloc from 3p-google-perftools on windows
2011-04-11 14:12:49 -05:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
a03f6997d8
update message template hash to correct value
2011-04-01 12:08:03 -04:00
cf4d929888
STORM-956 update message template
2011-04-01 06:49:19 -04:00
6540ccd307
Updated message template hash.
2011-03-31 16:15:48 -07:00
0080ed8e29
Merge
2011-03-31 14:07:54 -07:00
f360ce118d
Add template .sha1
2011-03-03 12:14:10 -08:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
f0d3cfc7bb
Unix EOL
2010-07-09 17:48:27 -07:00
3733337011
Gravity, Friction, Restitution, Density now work with simulator.
2010-07-09 17:47:58 -07:00
2530b057bb
added new physics parameters to prims
2010-07-01 17:18:55 -05:00
71dfe17fd1
Updated to latest MoneyBalanceReply message format
2010-04-02 09:45:17 -07:00
7381679cd0
Add TransactionInfo to MoneyBalanceReply, unpack test data
2010-04-01 10:15:37 -07:00
b2381a039d
DEV-47845 Cleaned up names.
2010-03-31 17:35:26 -07:00
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
96f29d2ba0
Update message template to agree with server-1-36
2010-02-11 18:58:33 -05:00
c252f122e3
DEV-45037 Attackers can request files from viewer cache
2010-01-19 19:42:13 -06:00
65bf35cfed
merge
2009-10-19 10:49:48 -07:00
477c2acffa
Cosmetic change. Took out unnecessary blank line near the end of LinkInventoryItem in message_template.msg.
2009-10-16 20:40:16 +00:00
bc4444cd78
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
2009-09-26 18:08:24 -04:00
053b14a97a
Fix error with message template incompatibility for LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585 into viewer-2 trunk, see QAR-1804 and QAR-1805.
...
Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry
2009-09-17 16:53:36 +00:00
74e584add6
svn merge -r132607:132665 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
...
Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804
2009-09-04 18:16:21 +00:00
2c31217cc9
svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4
...
Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3
2009-07-29 17:36:46 +00:00
17b9cda432
For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
...
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk
This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
2009-07-24 00:46:26 +00:00
a00af78b95
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-24 21:36:42 +00:00
9a8d069902
svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merging server-1.26 back to trunk.
Two conflicts -- llversionserver.hh (kept the trunk version)
and in llsimparcelmgr.cpp -- also kept the trunk version. There was
some code in 1.26 that included error
printing from RDW that says "we should
really not be hitting this code", and that
code was gone in trunk... so, went ahead
and kept the trunk part of that one
conflict in that file.
2009-05-19 17:16:44 +00:00
6df2755ba6
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-18 23:38:35 +00:00
cc92525b0d
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
...
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
RunitaiLinden