f04189ed9f
Merge Firestorm LGPL
2018-11-17 01:03:38 +01:00
4aa45cb8e1
Merge viewer-baking-updates
2018-06-16 13:22:49 +02:00
7abb0c99be
[DRTVWR-476] - add universal head,upper,lower tattoos
2018-06-13 01:09:27 +05:30
6e1cbd04b4
Merge
2018-06-05 23:21:30 +05:30
2de275724b
Merge Firestorm LGPL
2018-06-01 22:29:06 +02:00
acfe7e625e
Merge Firestorm LGPL
2018-06-01 22:10:21 +02:00
1b485c97e6
Merge viewer-baking-updates
2018-05-31 12:21:16 +02:00
f277aed218
[DRTVWR-455] - add new bake testure and tattoo slots
2018-05-24 01:17:07 -07:00
f9d432a570
Merge Firestorm LGPL
2018-05-08 19:29:46 +02:00
a2879b80a6
Merge Firestorm LGPL
2018-05-08 17:13:44 +02:00
8a81a43161
Merge.
2018-04-10 11:42:59 +02:00
3c8a71c017
Removing some more undefined behavior. Testing for a 'null-reference' (no such thing in C++) is undefined behavior and the compiler will optimize the case where the reference is invalid away.
...
After disussing with Nat remove that check and introduce new companion methods get...ref which fail in case an invalid reference would be returned.
2018-04-03 12:04:53 +02:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02: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
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
9401c93c7a
Merge viewer-bear
2015-11-11 19:40:43 +01: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
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02: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
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02: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
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07: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
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07: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
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
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08: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
Ansariel