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
3f77074f27
Automated merge up from viewer-development into mesh-development
2011-02-04 11:23:56 -05: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
15cdfda6bc
Sync with viewer-beta
2011-02-01 12:17:50 -08:00
b3a8189e05
merge
2011-02-01 15:00:06 -05:00
7662e5d4ac
SH-512: Inworld scale weights use previous maximum (10)
2011-02-01 14:59:05 -05:00
d08372f71d
merge fix for SH-659 from v-d to mesh: small textures not loaded
2011-02-01 12:43:12 -07:00
323f10c0bc
merge
2011-02-01 13:22:28 -06:00
ea7c6b0afe
Line endings?
2011-02-01 13:22:06 -06:00
c7d0fab7b9
Fixes for merge up from viewer-development to mesh-development.
...
Backed out SH-659 since merge was messy; this will be merged in manually later.
2011-02-01 12:33:39 -05:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
293b35f000
Automated merge from mesh-development
2011-02-01 11:16:43 -05:00
f0074f1002
merge changes back from beta branch
2011-02-01 07:22:32 -05:00
ee39db49a3
SH-831 Fix for local lights option not disabling local lights.
2011-02-01 03:13:47 -06:00
16f0386610
merge
2011-02-01 02:33:32 -06:00
1a51db5b53
SH-641 Cosmetic fix -- keep showing last rendered mesh LoD if requested LoD is unavailable.
2011-02-01 02:33:14 -06:00
2d04379bea
merge
2011-02-01 02:06:53 -06: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
Nyx (Neal Orman)