7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
7821ff23ba
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
2011-08-27 00:38:53 -05:00
6469f1c2f2
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-17 00:24:08 -05:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
13de92740e
merge latest viewer-development
2011-06-22 11:45:43 -04:00
7d49f7af58
SH-1785 Fix for hud attachments not rendering properly with indexed texture rendering.
2011-06-08 15:31:10 -05:00
53e890f4fd
SH-1359 General octree tune-up -- increase maximum capacity of an octree node and rework requested octree node sizes for minimum triangles per frame and maximum triangles per drawing call.
2011-05-26 20:37:15 -05:00
551d17f819
merge latest changes (post-2.7.0) from viewer-development
2011-05-23 11:38:33 -04:00
51bb3c15c8
SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead.
2011-05-19 20:38:39 -05:00
dab6d7b507
fix for SH-Render Metadata Physics Shapes on Development Client Gives Black Screen
2011-05-09 16:41:00 -06:00
6bdfc3d048
merge out changes up to but not including the STORM-610 change
2011-04-13 12:03:53 -04:00
1d34e7b90b
Automated merge with http://hg.secondlife.com/viewer-development
2011-04-06 15:20:51 -07:00
5a0547cdc3
STORM-1126 merge
2011-03-31 18:46:56 +03:00
4af9364197
SOCIAL-788 FIX HUD Click points not accurate in Basic mode
...
SOCIAL-789 FIX HUD position and function affected by Destination Guide and Avatar picker panels in Basic mode
2011-03-24 16:40:50 -07:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
92c3107419
fix for SH-1235: [PUBLIC] Select a HUD attachment and moving a child prim or entire linkset crashes viewer
2011-04-11 14:08:01 -06:00
01cdeb0cdd
Merge from viewer-development
2011-02-23 10:44:59 -07:00
8330a4d0fd
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
2011-02-19 00:17:12 +00: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
cfb3ee50c2
SH-948 don't occlusion cull everything when deferred rendering is enabled
2011-02-18 13:52:40 -06:00
ba4afc4a30
Automated merge up from viewer-development into mesh-development
2011-02-02 16:36:33 -05:00
d3bfbd8ebb
SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects.
2011-02-01 02:06:36 -06:00
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
f4ff1430f0
first iteration of memory pool code
2010-12-03 22:16:16 -07: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
e045d212d3
STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at merging in windlight estate settings to viewer-dev codebase.
...
not built, not tested. Probably needs a bunch of fixes to be able
to be integrated.
(resubmitted by Vadim ProductEngine)
2010-09-27 22:56:08 -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
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
Dave Parks