014480a79b
Merge
2018-11-28 15:16:01 -08:00
7abb0c99be
[DRTVWR-476] - add universal head,upper,lower tattoos
2018-06-13 01:09:27 +05:30
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
6e1cbd04b4
Merge
2018-06-05 23:21:30 +05:30
f277aed218
[DRTVWR-455] - add new bake testure and tattoo slots
2018-05-24 01:17:07 -07:00
7691780825
SL-694 - Added extra param field for flags related to extended mesh functionality. Currently this is just one bit to flag an object as able to animate
2017-05-25 11:11:02 +01:00
6770c27321
MAINT-6645 - Improvement - Agents that render as jelly dolls should have their attachments render at 0 LoD to prevent loading higher LoD complexity in memory thus deterring crashes.
...
Comments:
- Fix based on "RenderAutoMuteByteLimit" setting.
- File indra/llxml/llcontrol.h - add all signals to 0 group.
It garanty that handlers (in indra/newview/llviewercontrol.cpp) will be called last.
2017-01-24 15:56:25 +02:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
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
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
d9341caf45
MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected
2015-07-17 17:36:33 +03:00
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
c686407731
MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ALPHA_MODE_BLEND, do not render
...
MAINT-4645 FIXED [viewer-lion] The build tool shows normal or specular map as 'none' when one exists
2014-11-13 18:47:57 +02:00
f87a49fad9
BUILDFIX: bad quotes
2013-07-31 11:49:34 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
f356d7eb9f
Fix many issues with selection misapplication and rendering not matching applied materials
2013-05-11 19:58:56 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -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
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05:00
38a565f71a
Initial pass at getting a list of viewer objects with non-null material IDs.
2012-10-09 12:30:38 -07:00
6ae4802e6d
merge
2012-07-30 19:10:46 -04:00
833d73d674
fix for SH-3235: Bump maps are not loaded until objects change LOD
2012-07-13 17:46:43 -06:00
409be9dcc4
SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates
2012-07-13 16:59:57 -04:00
27c7b259b4
SH-3267 WIP
2012-07-12 18:24:23 -04:00
e4a0dda457
SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards
2012-06-28 14:24:04 -04:00
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
564087f6b0
addendum to prim fix
2011-07-19 15:33:43 -04:00
8b7e33ad36
Cherry pick of https://bitbucket.org/lindenlab/mesh-development/changeset/9cea44ebea3b by don, to fix old viewer crashes in mesh regions
2011-07-19 15:19:07 -04:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
e3a515f91c
Rough draft of physics display better matching what's on the sim.
2010-10-01 17:25:36 -05:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
ad51a5855f
Trying to resolve a strange crash in LLUUID::isNull()... by avoiding it for now.
2010-02-02 22:38:39 +00:00
56bd8e1f4d
Trying to resolve a strange crash in LLUUID::isNull()... by avoiding it for now.
2010-02-02 22:38:39 +00:00
2581f9ba0a
start to abstract-out the 'is a spotlight' question so one day we can perhaps make the UI hurt less.
2010-02-01 17:29:08 +00:00
e8899c4f4c
start to abstract-out the 'is a spotlight' question so one day we can perhaps make the UI hurt less.
2010-02-01 17:29:08 +00:00
3e80fa3dbc
Sync up with render-pipeline-7 ignore-dead-branch
2009-11-02 19:55:37 +00:00
89d92267e2
svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments
This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.
Reviewed by: Vir.
2009-10-16 21:41:31 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +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
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
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
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Anchor