summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-11Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-10Mergeleyla_linden
2011-02-10Backed out changeset 4fd25c7614e0leyla_linden
2011-02-10mergeDave Parks
2011-02-10SH-958 Fix for entire scene being in shadow when shadows + SSAO disabled but ↵Dave Parks
"Lighting and Shadows" enabled.
2011-02-10backing out sh-512 changesleyla_linden
2011-02-10SH-942 Deferred rendering options in preferences should be visible even if ↵leyla_linden
MeshEnabled is false.
2011-02-10Fix for linux build breakageBrad Payne (Vir Linden)
2011-02-10mergeBrad Payne (Vir Linden)
2011-02-10SH-915 WIP - LLAgentPilot class cleanup, added interpolation for camera motionBrad Payne (Vir Linden)
2011-02-10STORM-986 : Fix for Linux buildMerov Linden
2011-02-10STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows ↵callum
systems
2011-02-10Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-09STORM-986 : pull into viewer-developmentMerov Linden
2011-02-09mergeDave Parks
2011-02-09SH-920 Wait for threads to shut down before deleting them -- also, fix some ↵Dave Parks
assertions that were encouraging people to comment out the destruction of LLSignal.
2011-02-09SH-915 WIP - cleanupBrad Payne (Vir Linden)
2011-02-09pull from viewer-developmentMerov Linden
2011-02-09Mergeleyla_linden
2011-02-09SH-938 [REGRESSION] Mesh costs and old style costs shown in Edit tools on ↵leyla_linden
mesh region with MeshEnabled set to False
2011-02-09mergeDave Parks
2011-02-09SH-874 Revert much of the bad water bounding box and distortion texture ↵Dave Parks
usage changes from SNOW-643 and properly occlusion cull void water patches for machines without depth clamp.
2011-02-09SH-915 WIP - support pilot.xml with extended camera infoBrad Payne (Vir Linden)
2011-02-09SH-874 Fix for bad performance on cards without GL_ARB_depth_clamp in cases ↵Dave Parks
where water and terrain should be occluded.
2011-02-09Line endings.Dave Parks
2011-02-09SH-915 WIP - allow flycam control in autopilot record/playbackBrad Payne (Vir Linden)
2011-02-09Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-09trivial: remove some redundant code.Xiaohong Bao
2011-02-09Mergeleyla_linden
2011-02-09SH-840 Convert resource cost physics cost to prim countleyla_linden
2011-02-09Additional fix for llmediaplugintest compilation failure after fix for VWR-21275callum
2011-02-09debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in ↵Xiaohong Bao
LLSurface::getWaterHeight
2011-02-08STORM-601 : pull into viewer-developmentMerov Linden
2011-02-08STORM-433 : pull into viewer-developmentMerov Linden
2011-02-08STORM-507 : pull into viewer-developmentMerov Linden
2011-02-08STORM-953 : pull into viewer-developmentMerov Linden
2011-02-08STORM-955 : pull into viewer-developmentMerov Linden
2011-02-08STORM-960 : pull into viewer-developmentMerov Linden
2011-02-08VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the ↵callum
current working Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08SH-534 Don't allow deferred rendering to be enabled on windows PC's with GL ↵Dave Parks
version less than 3.0.
2011-02-08Mergeleyla_linden
2011-02-08SH-545 [REGRESSION] Enabled Basic Shaders Can Cause an Unrecoverable System ↵leyla_linden
Lock Up originally done in http://bitbucket.org/leyla/leyla-mesh-development
2011-02-08Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-02-08SH-940 FIX crash on startupNyx (Neal Orman)
Setting the lighting detail happens when we force a graphics level on startup. This got added with handleRenderLocalLightsChanged, which got added recently. setLightingDetail is safe to call with the pipeline uninitialized. Removing the assert to stop the crash. Fix verified to be safe by davep.
2011-02-08MergeDave Parks
2011-02-08SH-523 Fix for non-finite values in silhouette rendering resulting in ↵Dave Parks
silhouette segments pointing at center of screen.
2011-02-08Reduce number of potential joints in a rigged mesh to 32 for backwards ↵Dave Parks
compatibility with ATI X1950
2011-02-08Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-07SH-930 FIX revert ARC algorithm for merge to viewer-developmentNyx (Neal Orman)
Reverting incomplete changes to ARC so that we don't change RC when we merge down.
2011-02-07Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)