32c4a448b1
SH-571 Fix for shadows disappearing for a frame whenever an object switches octree nodes. Regressed EXT-7155 so fix for regression included.
2011-01-19 23:16:53 -06:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
cb54738a49
Merge from beta
2010-11-09 16:31:16 -05:00
dc59b268dc
SH-412 -- fix the way that redraws happen to eliminate flickering on resize -- patch from davep and seraph, I'm just applying it.
2010-11-09 15:18:41 -05:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
aad22f9faf
SH-281 Fix for snapshots showing interface all the time
2010-11-04 16:35:24 -04:00
ffc07281ad
SH-358 FIXED LLPipeline::renderBloom crash on Windows
2010-11-04 16:30:59 -04:00
e095665cca
SH-281 Fix for snapshots showing interface all the time
2010-11-01 12:30:54 -05:00
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
60758b214e
Potential fix for crash in renderBloom.
...
Reviewed by Seraph.
2010-10-26 14:31:20 -05:00
53beeec0a3
Potential fix for crash in renderBloom.
...
Reviewed by Seraph.
2010-10-26 14:31:20 -05:00
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
028bb02a6b
Better physics shape display.
2010-10-16 04:02:52 -05:00
5ee546eb4e
for SH-335: create a debug tool to track of memory availability.
2010-10-14 17:01:39 -06:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
34a063ae5a
VWR-20715 Double-click teleport
...
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2
By Twisted Laws and Thickbrick Sleaford
2010-08-26 16:49:41 +01: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
13202e744c
merge
2010-07-14 11:11:31 -05:00
c897061856
Merge with q/viewer-release
2010-06-21 10:21:52 -07:00
b770415b6a
Merge (and resolve conflict) from q/viewer-release
2010-06-17 11:37:21 -04:00
4bf8a0c7fc
Merge (and resolve conflict) from q/viewer-release
2010-06-17 11:37:21 -04:00
599a9a97b4
trivial: remove some debug code of llpushcallstacks.
2010-06-16 16:47:56 -06:00
aa96a6a4e8
EXT-7760: FIXED: only 10 avatars render non-impostored
2010-06-10 12:51:25 -06:00
26ba00b555
Vectorized octree and much of llspatialpartition and lldrawable.
...
Octree driven raycast.
2010-06-03 12:52:28 -05:00
ac17ec0c28
Merge pull from dessie/viewer-public
2010-05-19 15:58:56 -07:00
b325f72f7d
merge from viewer-public
2010-05-14 09:28:08 +01:00
d79351e689
merge from viewer-public
2010-05-14 09:28:08 +01:00
963214f624
EXT-7155: FIXED: bumpmaps failed to load
...
reviewed by davep.
(transplanted from fec2b449fbf9af842ee06e1be7198c4b2b879400)
2010-05-13 14:40:48 -06:00
c0a78f9106
EXT-7155: FIXED: bumpmaps failed to load
...
reviewed by davep.
2010-05-13 14:40:48 -06:00
4a3222d9c1
Fix for fullbright bump not working in deferred render.
...
Fix for shadow artifacts around split frusta.
Tweak for shadow aliasing with projectors.
Fix for crash on exit in mesh thread.
(transplanted from 6dcf09cd3e524016c8130a0c8af3d9fc95f2d411)
2010-05-12 03:59:01 -05:00
6c086be016
Fix for fullbright bump not working in deferred render.
...
Fix for shadow artifacts around split frusta.
Tweak for shadow aliasing with projectors.
Fix for crash on exit in mesh thread.
(transplanted from 6dcf09cd3e524016c8130a0c8af3d9fc95f2d411)
2010-05-12 03:59:01 -05:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
9950c22a55
Fix for fullbright bump not working in deferred render.
...
Fix for shadow artifacts around split frusta.
Tweak for shadow aliasing with projectors.
Fix for crash on exit in mesh thread.
2010-05-12 03:59:01 -05:00
b7a3582374
merge from viewer-trunk
2010-05-01 15:52:13 +01:00
f13b30848b
merge from viewer-trunk
2010-05-01 15:52:13 +01:00
f92d7f2829
merge from viewer-trunk
2010-05-01 06:47:55 +01:00
bb01c04624
trival: remove extra llpushcallstacks, which is for debug only.
2010-04-30 12:56:44 -06:00
64112134be
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
2010-04-26 14:42:06 +01:00
Dave Parks