23f64494b0
Automated merge up from viewer-development into mesh-development
2011-02-11 10:30:01 -05:00
29ea62811f
Merge
2011-02-10 17:30:38 -08:00
e3ce59b27d
Backed out changeset 4fd25c7614e0
2011-02-10 17:29:29 -08:00
536e90a2fa
merge
2011-02-10 18:39:22 -06:00
2111bb8eff
SH-958 Fix for entire scene being in shadow when shadows + SSAO disabled but "Lighting and Shadows" enabled.
2011-02-10 18:39:02 -06:00
5addce7331
backing out sh-512 changes
2011-02-10 16:26:23 -08:00
27286e4871
SH-942 Deferred rendering options in preferences should be visible even if MeshEnabled is false.
2011-02-10 16:24:52 -08:00
7a43bd5d9d
Fix for linux build breakage
2011-02-10 17:33:55 -05:00
711d70bd4c
merge
2011-02-10 15:58:08 -05:00
49b8f8af02
SH-915 WIP - LLAgentPilot class cleanup, added interpolation for camera motion
2011-02-10 15:57:08 -05:00
547b40bfc8
STORM-986 : Fix for Linux build
2011-02-10 11:56:06 -08:00
6a5d194526
STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows systems
2011-02-10 11:51:53 -08:00
e3ed1565f8
Automated merge up from viewer-development into mesh-development
2011-02-10 10:44:21 -05:00
76cb9a7796
STORM-986 : pull into viewer-development
2011-02-09 20:18:26 -08:00
952c3eaaa8
merge
2011-02-09 20:07:03 -06:00
d94117b80b
SH-920 Wait for threads to shut down before deleting them -- also, fix some assertions that were encouraging people to comment out the destruction of LLSignal.
2011-02-09 20:06:46 -06:00
54bf80bf45
SH-915 WIP - cleanup
2011-02-09 18:23:30 -05:00
b82f2c4e4d
pull from viewer-development
2011-02-09 15:10:26 -08:00
fd6c5296b6
Merge
2011-02-09 15:09:59 -08:00
d74c581360
SH-938 [REGRESSION] Mesh costs and old style costs shown in Edit tools on mesh region with MeshEnabled set to False
2011-02-09 15:09:15 -08:00
843a746f37
merge
2011-02-09 16:54:14 -06:00
10518eaaae
SH-874 Revert much of the bad water bounding box and distortion texture usage changes from SNOW-643 and properly occlusion cull void water patches for machines without depth clamp.
2011-02-09 16:53:47 -06:00
3ae3a4a6cb
SH-915 WIP - support pilot.xml with extended camera info
2011-02-09 17:07:13 -05:00
068822b18d
SH-874 Fix for bad performance on cards without GL_ARB_depth_clamp in cases where water and terrain should be occluded.
2011-02-09 15:28:46 -06:00
42404a89a3
Line endings.
2011-02-09 15:10:22 -06:00
64e017fc6b
SH-915 WIP - allow flycam control in autopilot record/playback
2011-02-09 15:04:25 -05:00
b6571ee127
Automated merge with http://hg.secondlife.com/viewer-development
2011-02-09 12:16:00 -07:00
8d43cb2701
trivial: remove some redundant code.
2011-02-09 12:15:21 -07:00
56b0423e89
Merge
2011-02-09 10:57:39 -08:00
d0bf3079d7
SH-840 Convert resource cost physics cost to prim count
2011-02-09 10:53:38 -08:00
0ea1b472c6
Additional fix for llmediaplugintest compilation failure after fix for VWR-21275
2011-02-09 10:12:20 -08:00
54cced2356
debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight
2011-02-09 10:33:07 -07:00
e58cbfa53e
STORM-601 : pull into viewer-development
2011-02-08 22:26:03 -08:00
300c79e7af
STORM-433 : pull into viewer-development
2011-02-08 22:25:10 -08:00
1c47a23d6b
STORM-507 : pull into viewer-development
2011-02-08 22:24:26 -08:00
47642e96f9
STORM-953 : pull into viewer-development
2011-02-08 22:23:32 -08:00
6ba900073f
STORM-955 : pull into viewer-development
2011-02-08 22:22:25 -08:00
2a13dc7930
STORM-960 : pull into viewer-development
2011-02-08 22:21:15 -08:00
7e6ce12a17
VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the current working
...
Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08 15:37:12 -08:00
8f9edd3874
SH-534 Don't allow deferred rendering to be enabled on windows PC's with GL version less than 3.0.
2011-02-08 17:19:54 -06:00
b30bf98531
Merge
2011-02-08 15:01:02 -08:00
9cd092544f
SH-545 [REGRESSION] Enabled Basic Shaders Can Cause an Unrecoverable System Lock Up
...
originally done in http://bitbucket.org/leyla/leyla-mesh-development
2011-02-08 15:00:42 -08:00
f2af75d93a
Automated merge with https://hg.secondlife.com/mesh-development
2011-02-08 17:40:16 -05:00
44119c512f
SH-940 FIX crash on startup
...
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-08 17:40:07 -05:00
ebf0dd4dce
Merge
2011-02-08 15:54:52 -06:00
a242129b57
SH-523 Fix for non-finite values in silhouette rendering resulting in silhouette segments pointing at center of screen.
2011-02-08 15:53:50 -06:00
854a0fe1c0
Reduce number of potential joints in a rigged mesh to 32 for backwards compatibility with ATI X1950
2011-02-08 15:52:32 -06:00
bfbd8e22cb
Automated merge up from viewer-development into mesh-development
2011-02-08 12:46:43 -05:00
8b15ca8d6b
SH-930 FIX revert ARC algorithm for merge to viewer-development
...
Reverting incomplete changes to ARC so that we don't change RC when
we merge down.
2011-02-07 21:03:10 -05:00
af5cdbbb96
Automated merge with https://hg.secondlife.com/mesh-development
2011-02-07 20:13:27 -05:00
Loren Shih