f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
2112abac1b
SL-16297 Support the parcel obscure_moap flag.
2021-12-17 18:13:20 +02: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
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
55612611c6
SL-694 - stub support for ObjectAnimation message type
2017-05-30 22:03:43 +01:00
dcac0dce59
Merge viewer-bear
2017-05-07 13:11:50 +02:00
bb0e2e6b95
Merged lindenlab/viewer-release into default
2017-05-01 09:04:14 -07:00
cee83074e9
Backed out changeset: 87661f6ec809
2017-03-13 14:47:28 -07:00
988f624f01
MAINT-7196: Revers flag when sent to viewer (to correctly mask when value isn't sent)
2017-03-13 14:16:37 -07:00
880be86cf2
MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners.
2017-03-10 15:07:55 -08:00
1bfe2a75f1
Merge viewer-neko
2017-03-03 19:05:21 +01:00
f88881884f
MAINT-7138 Fix Agent Limit field and spinner cap in Region/Estate floater
2017-02-23 12:17:59 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
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
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
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07: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
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
3e13995a3d
FIRE-8046: Support for Aurora Sim Var region - Adapted from Angstrom Viewer with thanks to nhede Core and Revolution Smythe. Also adds support for certain other aurora-sim features which still need some work.
2012-10-28 08:03:39 -06:00
58041846d5
Removing unreachable code from the viewer. Corresponding changes made on the server to remove the message handling.
2012-03-16 14:19:30 -07:00
4d77d3cca1
PATH-199: Cleaning up code related to object flags so that I can better use the flags to managed pathfinding flags such as permanent and character.
2012-02-28 19:07:44 -08:00
918238dd18
ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
...
Privacy" changes. Many naming changes for the featureto be "See avatars"
instead of "hidden avatars". Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
2011-07-01 14:06:08 -07:00
d11cabc489
Merge with latest lindenlab/viewer-development
2011-06-21 09:36:31 -07:00
c0c0a2b9a5
ER-944: Add feature to control user sounds on a parcel. Added new checkboxes
...
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-20 09:28:10 -07:00
5039378869
ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars"
2011-06-09 13:46:19 -07:00
31e850d048
transplant fix for SH-1467
...
viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not
2011-05-27 11:50:39 -07:00
9bfae21706
ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by Kelly
2011-05-02 16:35:55 -07:00
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
2eba9819df
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h
Change made to simulator files as well.
2010-04-05 15:02:36 -04: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
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +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
24b26d71ee
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merge latest 1.26 into trunk
2009-03-20 20:00:47 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
52562e2e66
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
...
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
Ansariel