250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
e606b7918d
MAINT-3211 Fix for texture animations not working properly on rigged attachments when worn from inventory.
2014-03-24 14:04:40 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
2a03e8f9fb
MAINT-3172 fix rendering regressions from release mergedown
2013-09-20 16:44:39 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
62011c2871
Fix merge issues from genBBoxes optimizations fighting with genBBoxes optimizations and missing statics
2013-08-19 12:56:04 -07:00
63cc379c72
MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found
2013-10-04 02:50:50 +03:00
d310105121
Merge recent viewer-bear fixes that missed the boat
2013-09-25 13:16:31 -07:00
d3625d0b67
Merge downstream code
2013-09-19 15:30:34 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
237dbb26f3
Merge downstream code - Vivox update
2013-08-05 14:55:12 -07:00
ee25146ce4
Merge downstream code
2013-08-01 16:19:49 -07:00
440e576f86
MAINT-2949 : Objects across the sim border do not render when approached. Added
...
missing code block from previous change as per Dave P's advice
2013-08-01 11:38:17 -07:00
50c472c242
renamed mVarianceSum to mSumOfSquares to be more clear
...
fixed normalization assertions to work with megaprims
added is_zero() utility function
fixed unit declarations to be more clear
fixed texture cache hit rate always being 0
2013-07-23 18:47:16 -07:00
721a2ac06a
MAINT-2717 FIX Cannot see kittycorner SLS region from Sunshine region
2013-07-22 21:32:22 +03:00
de4892b337
NORSPEC-288 remove unassertable asserts from restoring code to condition normals for this fix
2013-06-25 16:25:22 -07:00
4696eeeb30
Merge cleanup.
2013-06-21 17:07:37 -05:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
4e46ce5520
MATBUG-204 Fix for crash in genVolumeBBoxes
2013-06-20 17:17:28 -05:00
88553c9eb1
Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8
2013-06-12 12:19:48 -07:00
d2b253f1f6
Changes to protect against use of normalize3fast on degenerate vectors
2013-06-12 09:16:19 -07:00
eba7eb2d06
NORSPEC-233 fix default value and material apply logic errors
2013-06-08 06:28:48 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
743d1a777e
NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
...
Reviewed by Graham
2013-05-29 18:48:09 -05:00
a37bff8bf1
NORSPEC-103 reflect normal/spec UVs in face edit overlay display
2013-05-14 15:26:43 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
a9ede98915
NORSPEC-126 Make objects with normal maps applied obey legacy shiny settings
2013-05-06 08:56:32 -07:00
9187a06d0b
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
2013-05-03 09:16:15 -07:00
419a06036b
Merge with vwr-dev-mat
2013-05-03 08:22:50 -07:00
6bb9c2720e
NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into alpha mask pool.
2013-05-02 12:35:48 -05:00
ced83c5248
Merge vwr-dev-mat
2013-04-26 13:13:55 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
8bf4f15911
NORSPEC-104 Fix for texture animation sometimes not overriding specular and normal map texture coordinates.
2013-04-25 17:15:47 -05:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
c7bab8ab8b
Merge
2013-04-11 16:04:21 -07:00
78d23e6642
NORSPEC-75 Add appropriate draw calls to underwater render passes so objects with material data don't disappear in water.
2013-04-10 00:27:32 -05:00
14f02e48b8
NORSPEC-66 Hook up material parameters to rigged attachments.
2013-03-29 20:12:27 -05:00
fc4869fb78
NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps.
2013-03-29 16:13:36 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
0ddeaa1967
for SH-3927: Interesting: Viewer should send predicted camera position to simulator to control object load order
2013-03-25 18:45:42 -06:00
41ca92c67c
NORSPEC-54 Potential fix for crashing on all sorts of random operations.
2013-03-25 18:27:07 -05:00
35383790fb
Merge pragma warning hack to fix linux build
2013-03-12 04:40:51 -07:00
simon