Dave Parks
7d49f7af58
SH-1785 Fix for hud attachments not rendering properly with indexed texture rendering.
2011-06-08 15:31:10 -05:00
Dave Parks
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
Dave Parks
51bb3c15c8
SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead.
2011-05-19 20:38:39 -05:00
Xiaohong Bao
dab6d7b507
fix for SH-Render Metadata Physics Shapes on Development Client Gives Black Screen
2011-05-09 16:41:00 -06:00
Dave Parks
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
Xiaohong Bao
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
Richard Linden
1d34e7b90b
Automated merge with http://hg.secondlife.com/viewer-development
2011-04-06 15:20:51 -07:00
Richard Linden
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
Don Kjer
8330a4d0fd
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
2011-02-19 00:17:12 +00:00
Don Kjer
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
Dave Parks
cfb3ee50c2
SH-948 don't occlusion cull everything when deferred rendering is enabled
2011-02-18 13:52:40 -06:00
Loren Shih
ba4afc4a30
Automated merge up from viewer-development into mesh-development
2011-02-02 16:36:33 -05:00
Dave Parks
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
Dave Parks
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
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Kent Quirk
cb54738a49
Merge from beta
2010-11-09 16:31:16 -05:00
Kent Quirk
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
Loren Shih
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
Loren Shih
aad22f9faf
SH-281 Fix for snapshots showing interface all the time
2010-11-04 16:35:24 -04:00
Loren Shih
ffc07281ad
SH-358 FIXED LLPipeline::renderBloom crash on Windows
2010-11-04 16:30:59 -04:00
Dave Parks
e095665cca
SH-281 Fix for snapshots showing interface all the time
2010-11-01 12:30:54 -05:00
Loren Shih
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
Loren Shih
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
Dave Parks
60758b214e
Potential fix for crash in renderBloom.
...
Reviewed by Seraph.
2010-10-26 14:31:20 -05:00
Dave Parks
53beeec0a3
Potential fix for crash in renderBloom.
...
Reviewed by Seraph.
2010-10-26 14:31:20 -05:00
Merov Linden
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
Loren Shih
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
Loren Shih
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
Dave Parks
028bb02a6b
Better physics shape display.
2010-10-16 04:02:52 -05:00
Xiaohong Bao
5ee546eb4e
for SH-335: create a debug tool to track of memory availability.
2010-10-14 17:01:39 -06:00
Oz Linden
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
Merov Linden
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
Dave Parks
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
Brad Payne (Vir Linden)
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
Leyla Farazha
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
Aimee Linden
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
Aimee Linden
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
Aimee Linden
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
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
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
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Dave Parks
13202e744c
merge
2010-07-14 11:11:31 -05:00
Leyla Farazha
c897061856
Merge with q/viewer-release
2010-06-21 10:21:52 -07:00
Kent Quirk
b770415b6a
Merge (and resolve conflict) from q/viewer-release
2010-06-17 11:37:21 -04:00
Kent Quirk
4bf8a0c7fc
Merge (and resolve conflict) from q/viewer-release
2010-06-17 11:37:21 -04:00
Xiaohong Bao
599a9a97b4
trivial: remove some debug code of llpushcallstacks.
2010-06-16 16:47:56 -06:00
Xiaohong Bao
aa96a6a4e8
EXT-7760: FIXED: only 10 avatars render non-impostored
2010-06-10 12:51:25 -06:00
Dave Parks
26ba00b555
Vectorized octree and much of llspatialpartition and lldrawable.
...
Octree driven raycast.
2010-06-03 12:52:28 -05:00
Leyla Farazha
ac17ec0c28
Merge pull from dessie/viewer-public
2010-05-19 15:58:56 -07:00