d0bf3079d7
SH-840 Convert resource cost physics cost to prim count
2011-02-09 10:53:38 -08: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
44308a6693
SH-923 FIX particle render cost does not appear to be functioning properly
...
was checking the age of the particle system, not the individual particles.
This appears to fix the problem. Deferring QA on the new algorithm until it
is completed.
2011-02-07 20:12:42 -05:00
09b009fc23
STORM-610 : Backing out that change (test fail)
2011-02-04 16:38:26 -08:00
6371ce7727
Clean up license headers in a handfull of files
2011-02-04 15:38:15 -08:00
a8952915e3
STORM-655 : Pull into viewer-development
2011-02-04 15:26:14 -08:00
422174a804
STORM-610 : Pull into viewer-development
2011-02-04 15:25:10 -08:00
3f77074f27
Automated merge up from viewer-development into mesh-development
2011-02-04 11:23:56 -05:00
6c76421814
STORM-465 FIXED Made all keys localizable.
...
Renamed HUD direction strings ("Left", "Right", "Up", "Down") to avoid strings duplication.
2011-02-04 16:41:52 +02:00
9f361b47ff
Automated merge with https://hg.secondlife.com/mesh-development
2011-02-03 19:45:47 -05:00
fbfecd49c7
SH-861 FIX update render cost algorithm to use geometry triangle counts
...
base cost is now geometry-based, for both meshes and prims
Some of the previous weights have been recalibrated based on testing.
Code reviewed by davep. Deferring QA for now until the other parts of the algorithm
are updated, as re-generating the test takes time each time the algorithm
changes.
2011-02-03 19:45:29 -05:00
aa9d9901e8
SH-580 FIXED Crash in curl on exit
...
New defensive programming added this llerrs trigger. This is worth investigating but not at the top of our priority at the moment. Reverting to llinfos for now as has been done for non-Windows builds already.
2011-02-03 17:49:19 -05:00
e82fb8c7b9
STORM-513 : pull into viewer-development
2011-02-03 14:09:02 -08:00
3feb97487a
STORM-397 : pull into viewer-development
2011-02-03 14:06:51 -08:00
e9630662f4
STORM-316 : pull into viewer-development
2011-02-03 14:04:52 -08:00
4df842eb35
Pull from viewer-beta
2011-02-03 13:42:08 -08:00
22fb0f0fa6
Added tag 2.5.0-beta3, DRTVWR-34_2.5.0-beta3 for changeset b723921b5c71
2011-02-03 13:29:45 -08:00
957b8b15e1
Automated merge up from viewer-development into mesh-development
2011-02-03 10:32:05 -05:00
5bd5d918ca
merge
2011-02-02 19:03:03 -06:00
bb113f75ef
SH-900 Fix for only lowest LoD appearing for objects in neighboring regions.
2011-02-02 19:01:27 -06:00
9e966bfe9f
Tweak to physics shape display render to show convex decompositions.
2011-02-02 19:00:52 -06:00
b15b43b14e
Merge with viewer-development
2011-02-02 15:06:06 -08:00
dca34a56d2
STORM-435 : pull into viewer-development
2011-02-02 15:04:27 -08:00
7cac604dbd
Pull from viewer-beta
2011-02-02 14:58:16 -08:00
70aceaaa95
STORM-957 : pull in viewer-beta (da and fr localization)
2011-02-02 14:56:05 -08:00
33f82d7885
Merge
2011-02-02 14:46:54 -08:00
40f38c13a8
SH-734 - also adding fix into the llcapabilitylistner test
2011-02-02 14:46:19 -08:00
ba4afc4a30
Automated merge up from viewer-development into mesh-development
2011-02-02 16:36:33 -05:00
515ccf300c
Automated merge with http://hg.secondlife.com/viewer-development
2011-02-02 12:43:15 -07:00
9ba8087a00
fix for Sh-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files
2011-02-02 12:42:59 -07:00
8f253a33e8
Sync with viewer-development
2011-02-01 17:58:50 -08:00
0edcdc42f2
Automated merge with http://hg.secondlife.com/viewer-development
2011-02-01 17:55:33 -07:00
fb3ba97f93
STORM-484 : pull in viewer-development
2011-02-01 16:54:29 -08:00
436fe6a412
fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially)
2011-02-01 17:53:25 -07:00
990a620660
Merge
2011-02-01 15:42:52 -08:00
1b366dfe72
SH-734 [REGRESSION] INTEGRATION_TEST_llsdmessage and _capabilitylistener failing in opensource environment
2011-02-01 15:34:00 -08:00
2dbbf6bdb8
fix for SH-891: crash at LLDrawable::getFace(int)
2011-02-01 16:01:44 -07:00
11efdf9381
CT-635 FIX DA and FR translation
2011-02-01 14:28:13 -08:00
105872b94e
merge
2011-02-01 15:35:56 -06:00
7c5c82cb11
merge
2011-02-01 14:46:40 -06:00
40e1041871
SH-818 Fix for inability to disable anti-aliasing on ATI catalyst.
2011-02-01 14:46:20 -06:00
leyla_linden