Commit Graph

45 Commits (fdee1057aa4e8a28a808b81dc18b35cab68bcd0b)

Author SHA1 Message Date
RunitaiLinden 2b2154f021
SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and brightness to allow ACES Hill all the time. 2023-04-11 15:09:58 -05:00
RunitaiLinden 7c831d115b
SL-18458 Make LLVOCache the one source of truth on most recently received overrides. (#147) 2023-04-03 15:22:40 -07:00
Andrey Kleshchev d423263d54 SL-19169 Local material updates aren't applied with non-default transforms 2023-03-23 06:15:09 +02:00
Cosmic Linden 693925ef23 SL-18820: Fix applying material clearing transform overrides. Loosen some asserts to allow non-default transform overrides. 2023-01-10 17:09:30 -08:00
Dave Parks 9f21fba6d9 SL-18513 Put profile markers around GLTF code. 2022-11-01 08:31:01 -05:00
Dave Parks 0e02f25604 SL-18472 Fix for assert when increasing number of texture entries on existing primitive with overrides applied. 2022-10-26 23:51:13 -05:00
Dave Parks 65eec2ca8f Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-26 17:22:50 -05:00
Dave Parks 8f47657d64 SL-18443 Allow nulling out of override data and implement new override message protocol. 2022-10-26 16:08:28 -05:00
Dave Parks 5c86ec6a61 SL-18105 Add mechanism for applying overrides that were received before associated ViewerObject was ready to receive them. 2022-10-24 16:26:42 -05:00
Dave Parks 88659e9fe7 SL-18105 When saving an object's material to inventory, save the version that as overrides applied. 2022-10-22 15:25:03 -05:00
Dave Parks 8741c05cc1 SL-18105 Hook up TE override material to render pipe by way of render material. 2022-10-19 17:23:54 -05:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
ruslantproductengine 049c795b12 Backed out changeset: a79540758404
Need backed out this changes because it influence on material
update see: MAINT-5818
Also this lead to the following:
UserA and UserB logged in same location.
UserA edit normal/specular map texture offsets while UserB is not observe this
changes.
2015-11-11 17:59:14 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
vyacheslavsproductengine 0a333e9a03 MAINT-3548 - FIXED-R2 Horizontal & vertical offset values for normal & specular maps still randomly revert to previous settings when building. 2015-05-19 19:28:03 +04:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Linden f782e01920 NORSPEC-267 fix UI feedback for materials edits not appearing for observers when obj was selected by them 2013-06-15 05:18:50 -07:00
Kitty Barnett ad09e2111c NORSPEC-102 & Co Reloaded 2013-05-14 21:14:46 +02:00
Graham Madarasz d9e8ee7cfd NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter 2013-05-13 13:02:53 -07:00
Kitty Barnett 5ac9d9cb05 LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null 2013-05-12 16:10:31 +02:00
Kitty Barnett 6fd7f146d4 Merged with viewer-dev-materials 2013-05-12 12:39:52 +02:00
Graham Madarasz f356d7eb9f Fix many issues with selection misapplication and rendering not matching applied materials 2013-05-11 19:58:56 -07:00
Kitty Barnett 269b8b7de5 NORSPEC-102 Rapid materials updates are not smooth to viewer which is editing the object 2013-05-10 10:50:50 +02:00
Graham Madarasz 5aa3f3c808 NORSPEC-164 fix TE copy ctor and operator= to include material pointer in addition to ID 2013-05-09 15:41:07 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Dave Parks f189ba4a3d NORSPEC-71 Lots more UI hookups
Written with and Reviewed By Graham
2013-04-03 16:56:59 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
William Todd Stinson 38a565f71a Initial pass at getting a list of viewer objects with non-null material IDs. 2012-10-09 12:30:38 -07:00
Merov Linden 16443c4df3 STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett) 2011-03-11 15:09:44 -08:00
Xiaohong Bao 8dad2e56f3 fix for SH-416: crash at LLFace::getGeometryVolume line 1003 2010-12-23 11:42:17 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
brad kittenbrink 50247533f9 Merged latest viewer/login-api with latest viewer/viewer-20 2009-10-07 17:51:28 -07:00
Rick Pasetto aba67da38b FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URL 2009-10-05 18:14:27 -07:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module.
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.

reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
2009-05-22 23:27:16 +00:00
Andrew Meadows 3d4e04b556 QAR-1284 ip-takedown tools simulator work is ready for merge
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
2009-04-01 17:11:37 +00:00
Aaron Brashears 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
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Karl Steifvater b699ae454d merge -r67812:67818 svn+ssh://svn.lindenlab.com/svn/linden/branches/windlight-server/ --> release 2007-08-16 00:59:41 +00:00
Brad Kittenbrink 029130bf9c svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release 2007-05-23 21:17:34 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00