fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
ba1266043f
trivial: for VWR-22353: remove debug code for EXT-6791.
2011-01-07 15:04:36 -07:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
b3c06e6a74
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:49 -05:00
2504824d59
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:49 -05:00
e403f402e9
some debug code for SH-288: [crashhunters] LLImageGL::setSubImageFromFrameBuffer
2010-10-13 19:33:36 -06:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04: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
2969599880
a try to fix EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-30 18:06:45 -06:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
6fbc79d5e8
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01:00
ce1a0c6baf
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01:00
f263ee0444
added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
...
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
17553add7c
added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
...
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
5f400b3b7c
more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-07-22 11:38:26 -06:00
731086241b
EXT-8457: FIXED: crash at [1] LLImageGL::checkTexSize(bool) [secondlife-bin llimagegl.cpp]
2010-07-22 11:28:16 -06:00
7ac8658c77
(hairy) merge from viewer-release
2010-07-26 10:34:39 +01:00
44d0fd81ee
(hairy) merge from viewer-release
2010-07-26 10:34:39 +01:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
b088449517
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
2010-06-21 11:24:33 -07:00
a6cf0bed74
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
2010-06-21 11:24:33 -07:00
07f9e9035e
EXT-4388 Crash in octree line segment intersection code (getMask)
2010-06-18 13:29:10 -05:00
98d72d1dd3
Disabling some asserts for now so client is usable.
2010-05-22 12:49:32 -05:00
5ab2d07555
EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
2010-04-30 13:50:59 +01:00
d3eb6ffff5
EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
2010-04-30 13:50:59 +01:00
b0fa1e011f
EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
...
(transplanted from 0aaf4b4676f27560cc436d0ff74b7d812a1e6662)
2010-04-30 13:50:59 +01:00
f28a9b3ca5
merge from viewer-trunk
2010-04-19 14:30:43 +01:00
b362cc60d9
merge from viewer-trunk
2010-04-19 14:30:43 +01:00
230314ac71
merge from viewer-trunk
2010-04-15 20:39:00 +01:00
5dda65c030
EXT-4388 Crash in octree line segment intersection code (getMask)
...
Add yet more paranoia-and-return-or-assert, this time for +-INF in input vector.
To be reviewed by Bao.
(transplanted from 2012f21d23c66179345fb26148cfbe19835b325e)
2010-04-15 20:15:40 +01:00
5c29fa9383
slightly conflicty merge from viewer-trunk, again
2010-04-12 11:57:07 +01:00
c330e26db8
slightly conflicty merge from viewer-trunk, again
2010-04-12 11:57:07 +01:00
f8f1e30ac3
slightly-hairy merge from viewer-trunk
2010-04-12 11:55:54 +01:00
9fbe736774
(slightly hairy) merge from viewer-hotfix
2010-04-12 11:03:16 +01:00
0dee7a3ece
debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D.
2010-04-09 22:02:32 -06:00
61774546f0
HUGE merge from viewer-trunk. Many conflicts resolved.
2010-03-30 13:15:36 +01:00
6acaa5fe30
If the EXT-5854 fix is correct, this assert no longer makes sense.
2010-03-26 08:54:58 +00:00
6f179fc6ac
fix for EXT-5854:Unable to Pay Object That Features Transparant (alpha) Texture.
2010-03-25 17:21:39 -06:00
8bafcc0491
EXT-5553 improve alpha mask ('fast alpha') heuristic
...
rev'd by davep
2010-02-19 09:45:30 +00:00
45529e8cad
EXT-5553 improve alpha mask ('fast alpha') heuristic
...
rev'd by davep
2010-02-19 09:45:30 +00:00
93b74186a3
EXT-5553 improve alpha mask ('fast alpha') heuristic
...
rev'd by davep
2010-02-19 09:45:30 +00:00
9b410e89c3
EXT-4388 Crash in octree line segment intersection code
...
Yet more sanitization - whew.
2010-02-01 12:02:11 +00:00
e70d7fca4b
CID-155
...
Checker: OVERRUN_DYNAMIC
Function: LLImageGL::updatePickMask(int, int, const unsigned char *)
File: /indra/llrender/llimagegl.cpp
not a bug, AFAICT.
2010-01-27 14:04:02 -08:00
b00813ae3c
EXT-4388 Crash in octree line segment intersection code
...
a more complete fix and some sanity to prevent recurrance of a similar problem.
reviewed by bao!
2010-01-25 16:35:50 -08:00
417f0ede41
EXT-4388 Crash in octree line segment intersection code
...
(more accurately, it was - I believe - reading over the end of a buffer in the pick-mask lookup)
reviewed by qarl.
2010-01-20 15:59:26 -08:00
4c91f45448
Clean up the llimage init-ordering and header comments, to make it clearer when we miss initializing a member. No semantic change.
2010-01-19 12:58:49 -08: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
Loren Shih