1911993cc7
merge
2010-09-16 19:45:57 -07:00
704405903f
pull from viewer-development
2010-08-31 19:55:19 -04:00
2969599880
a try to fix EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-30 18:06:45 -06:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
093e83386d
merge
2010-08-26 12:49:00 -07:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
ce1a0c6baf
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01: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
45b6098477
EXT-8525 FIX ellipsis are broken on the Favorites bar (trunk)
2010-08-19 17:35:08 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
ad9330025d
fixed crash on entering build mode
...
(transplanted from 72651623d96deee014411daeb82d50452261e0b3)
2010-08-06 11:03:28 -07:00
a5c80966e7
Backed out changeset 7a739cbdce56
...
A proper fix from Richard is coming next.
2010-08-27 13:47:47 +01:00
1a8d917a6d
lame-but-effective workaround for self-editing UI bug, until the right fix is ready.
2010-08-26 13:09:55 +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
5866710be7
fixed crash on entering build mode
2010-08-06 11:03:28 -07:00
932f248553
optimized font lookups
2010-08-04 19:01:28 -07:00
d72a21aca1
further UI rendering performance improvements
2010-07-30 15:17:32 -07:00
c9ea67aab0
merge
2010-07-29 12:05:48 -07:00
6a3538a693
fix for truncated text rendering
2010-07-29 11:53:31 -07:00
9206341e68
fix an implicit downcast in font code.
2010-07-28 11:45:01 +01:00
b4dfa76c9d
merge
2010-07-27 10:30:17 -07:00
44d0fd81ee
(hairy) merge from viewer-release
2010-07-26 10:34:39 +01:00
50d8cc6d37
first pass ui rendering performance improvements
2010-07-23 22:07:15 -07: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
510958f6c4
Merge from default branch
...
--HG--
branch : product-engine
2010-07-05 16:55:05 +03:00
3de5be44ad
Merged from viewer-release
2010-07-02 07:07:23 -07:00
ee7fce63fe
missed some cases in font valign switch
2010-07-01 21:29:25 -07:00
187a4b638d
EXT-7654 - About Land Floater> Icons missing
...
fixed layout of embedded icons in text labels
2010-07-01 19:48:39 -07:00
207e866fd3
Merge from default branch
...
--HG--
branch : product-engine
2010-07-01 18:10:43 +03:00
cc675226bd
Attempt to fix viewer-public build from bad merge.
2010-07-01 15:45:47 +01:00
67f0a792a2
Merged from viewer-release
2010-06-30 12:03:06 -07:00
ea0192f157
Line endings.
2010-06-28 16:11:22 -05:00
f740214f9d
Porting VBO changes from davep/viewer-release.
...
Better usage of LLVertexBuffer::sEnableVBOs.
Added RenderUseStreamVBO debug setting for controlling usage of VBOs for particles/avatars/etc.
2010-06-28 16:09:36 -05: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
51c8c74da5
Merged from viewer-release
2010-06-11 15:04:21 -07:00
3bb98107a9
Backed out changeset useVBO fix, 12f94ed4e02b, "LLVertexBuffer only supposed to use sEnableVBOs at moment vert buff is created" for EXT-7835. Will fix soon.
2010-06-11 11:34:15 -07:00
0c8164b894
Fix for useVBOs being busted when sEnableVBOs gets flipped.
...
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
(transplanted from 11bf20602885c3d2d42d8a7f7361d2005a708b5c)
2010-06-04 00:09:52 -05:00
3906a4eb1d
Fix for useVBOs being busted when sEnableVBOs gets flipped.
...
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
2010-06-04 00:09:52 -05:00
bd174cbceb
merge from viewer-public
2010-06-02 21:22:17 +01:00
9a832999d9
fix unloaded no-particle avatar sphere to be fullbright, no black flicker. reviewed by Nyx.
2010-05-28 14:33:29 -05:00
d3eb6ffff5
EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
2010-04-30 13:50:59 +01:00
bf8b1bca7d
Let GL errors be caught on Linux - don't know why this was disabled.
...
(transplanted from a149524a63039870704a498952d9bb3aa599b472)
2010-04-22 16:28:33 +01:00
873ed0febf
Make assert_glerror not a hotspot.
...
(transplanted from 8476304a30a3c387a722b33743ef3385e85f85a0)
2010-04-20 11:38:07 -05:00
b362cc60d9
merge from viewer-trunk
2010-04-19 14:30:43 +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
c330e26db8
slightly conflicty merge from viewer-trunk, again
2010-04-12 11:57:07 +01:00
9fbe736774
(slightly hairy) merge from viewer-hotfix
2010-04-12 11:03:16 +01:00
Richard Linden