b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
d3b192c26f
STORM-1090 : Fix for use of freetype 2.4.4 and switch to freetype 2.4.4 in installables
2011-03-23 13:39:31 -07:00
075b1af62a
STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error)
2011-03-08 17:00:39 -08:00
e64096da69
fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
...
reviewed by davep
2011-03-07 15:02:48 -07:00
609c70eb5a
separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.
...
reviewed by davep.
2011-02-23 11:41:13 -07:00
97eb1b9da4
Merge with viewer-development
2011-02-22 21:27:47 +00:00
417069f152
more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.
2011-02-22 11:22:50 -07:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
f13884e528
partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.
2011-02-15 14:12:58 -07:00
ba1266043f
trivial: for VWR-22353: remove debug code for EXT-6791.
2011-01-07 15:04:36 -07:00
90c2c4a9bc
SH-392 Port over fix from mesh-development for FBOs on OSX
2010-10-27 16:19:18 -05:00
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
b3c06e6a74
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:49 -05:00
ad181dcaac
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:03 -05:00
219cd6ecda
more debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer.
2010-10-14 21:23:23 -06:00
e403f402e9
some debug code for SH-288: [crashhunters] LLImageGL::setSubImageFromFrameBuffer
2010-10-13 19:33:36 -06:00
c3764eaf87
add debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer
2010-10-12 15:38:52 -06:00
4809142acc
add a debug function to output gl error information to the log file without crashing the viewer.
...
No need to test because there are no negative effects.
2010-10-12 15:35:39 -06:00
d65e512fa3
Automated merge up from viewer-development
2010-10-04 11:21:18 -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
85053e53b6
fix for VWR-22811: crash at LLImageGL::createGLTexture(int,unsigned char const *,int,int) [secondlife-bin llimagegl.cpp] line 1259
2010-09-10 10:26:42 -06: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
1911993cc7
merge
2010-09-16 19:45:57 -07: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
Oz Linden