b6dc4a4bf1
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-29 17:21:12 -05:00
94770bbb3f
SH-531 / CTS-324 FIX fix of VWR-20749 / SNOW-624 lost in merge
...
Re-applied fix originally committed in 1e93695ded30
Reveiewed code, appears straightforward.
2010-11-29 17:21:03 -05:00
32d496e472
removed scrub_host_name
2010-11-29 16:24:52 -05:00
19ced614ad
merge
2010-11-29 10:48:19 -05:00
d524cf98c7
SH-481 FIX linux build is over 200 MB
...
A previous merge in our move to the public branch cut out the binary strip
command from viewer_manifest.py. Putting it back in to restore small binaries.
2010-11-24 17:09:33 -05:00
3d9aac7f16
updated curl build on windows
2010-11-24 16:35:28 -05:00
c6e3a16b52
merge
2010-11-24 10:11:19 -05:00
fae00f8c79
SH-564 WIP - scrubbing not needed if curl uses thread-safe c-ares lib
2010-11-24 09:03:14 -05:00
3d83c6501e
Tweak fnumber and circle of confusion to be more typical of 35mm daytime.
2010-11-24 04:05:51 -06:00
c21a9b28a2
merge
2010-11-24 03:37:08 -06:00
894dd833f7
Depth of Field whenever "Lighting and Shadows" is enabled and global-illumination is not (experimental).
2010-11-24 03:36:41 -06:00
d49d1def45
automated merge from mesh-development
2010-11-23 12:04:27 -05:00
b8a0549ac2
SH-429 FIXED Inventory Filter for Meshes does not work
...
Mesh inventory filter was added incorrectly to filters pane, and was not hooked up to any code.
2010-11-23 12:03:54 -05:00
e3df3baff7
Fix for SH-479
2010-11-23 09:52:31 -05:00
be1fd73390
CTS-320 SH-465 FIX use system zlib for standalone builds
...
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
2010-11-22 18:42:34 -05:00
65a66458c2
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-22 16:49:21 -05:00
8fb0d4f2d0
SH-466 FIX fix of VWR-20670/SNOW-506 lost in merge
...
Verified that the fix is no longer in mesh-development.
Verified fix is still in viewer-development.
Fix is simply changing visibility of LLInstanceTracker base in
LLEventTimer from protected to public.
The lack of this fix indicates a bad merge. Re-applying fix.
2010-11-22 16:49:14 -05:00
aafd7abd70
SH-467 FIX fix of VWR-20809/SNOW-504 lost in merge
...
re-applying the fix originally committed as c5ddd1e361ae.
This allows standalone builds to not depend on stage_third_party_libs
but was lost in a merge as referenced in jira. Re-reviewed the code
in the patch and it is a valid fix.
2010-11-22 16:44:58 -05:00
4ada50182f
SH-468 FIX fix of VWR-20810/SNOW-503 lost in merge
...
re-applying changeset b987077e9bbb as it was lost in the merge.
reviewed the original patch, appears valid.
2010-11-22 16:40:32 -05:00
9905870465
Fix typo for llconvexdecompositionstub darwin package.
...
CR: davep
2010-11-22 12:24:55 -08:00
43382f2849
merge of earlier code that got stomped from a previous merge
2010-11-22 13:16:39 -05:00
2915715ec4
Remove dependency on ll_align_malloc/free from avatar.
2010-11-21 05:09:59 -06:00
4b5ddf1c41
Remove ll_aligned_malloc from llspatialpartition
2010-11-21 04:40:59 -06:00
892d70f5d5
Prune ll_aligned_malloc/free calls out of lldrawable and llface
2010-11-21 03:48:11 -06:00
81ba8b8bc6
Get rid of more ll_aligned_malloc calls.
2010-11-21 03:25:22 -06:00
c149a0020b
Get rid of pointless redirection and malloc/free.
2010-11-21 03:06:47 -06:00
e4b502793d
Fake anti-aliasing for deferred rendering as an alternative to real anti-aliasing.
2010-11-21 02:53:33 -06:00
6866900e92
Fix for crash when uploading textures via importer. Uploads still fail, though, fix just makes them stop trying after 5 retries when getting 499 or 500 status codes.
2010-11-21 00:09:33 -06:00
8f50486dd9
remove unused variable make gcc happy
2010-11-19 20:39:17 -06:00
589b571013
Don't reset preview target unless high LOD is being swapped out.
2010-11-19 18:59:16 -06:00
585ddf18fc
SH-525 fix for crash when specifying LOD slots out of order.
2010-11-19 18:49:35 -06:00
0bb387a030
merge
2010-11-19 17:12:38 -06:00
3a1fbcab2a
SH-448 Initial draft of implementing UI spec for "advanced" importer.
2010-11-19 17:07:01 -06:00
2772a77470
Don't use llwarns/llinfos from a background thread.
2010-11-19 16:59:35 -06:00
87571e5d68
merge
2010-11-19 16:33:55 -06:00
ed1d8811d8
Hack old .dll into collada package to make vista/xp happy. Might need to revert if builds start failing.
2010-11-19 16:33:17 -06:00
82315e232e
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-19 17:12:10 -05:00
0891a4adc6
SH-356 FIX render cost doesn't factor in revolutions
...
Added a revolutions factor to render cost calculations.
Adding revolutions will multiply your render cost based
on how much geometry is added, from 1x up to 4x
Code reviewed by Davep.
Wiki documentation updated.
2010-11-19 17:12:06 -05:00
6b0d10975b
merge
2010-11-19 16:17:26 -05:00
292941ac94
Fix for crash on accessing a translation element that is NULL
2010-11-19 16:08:32 -05:00
b5585a2d55
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-18 17:28:18 -05:00
52f397ec7a
SH-350 SH-351 SH-355 FIX ARC fixes
...
Had a few debugging lines in my last checkin.
Cleaning up unreviewed changes.
2010-11-18 17:28:13 -05:00
896dc4c583
Added build params for mesh-development
2010-11-18 17:15:11 -05:00
5e57352e12
SH-350 SH-351 SH-355 FIX Several fixes for ARC
...
Fixed the texture resolution calculation against the rounding errors
we had before.
Fixed the bug where linking prims changed the combined cost
Fixed the bug where twisting was not computed properly
Code reviewed by davep.
2010-11-18 16:42:57 -05:00
4c86da5900
merge
2010-11-17 22:46:21 -05:00
57e5841a9c
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-17 20:04:37 -05:00
48e2ec0340
SH-480 FIX meshes are not added to objects folder on upload
...
curl host scrubbing was causing object creation for mesh prims to fail.
Commenting out the offending lines so we can have a functional release.
Will file a separate bug for Vir to investigate when/if we can re-enable
host scrubbing on these URLs for a future release.
Approach approved by davep.
2010-11-17 20:04:30 -05:00
071e0339b7
merge
2010-11-17 15:02:13 -05:00
29852bc012
SH-476 FIX. Map tiles were failing when numeric addrs were substituted in amazon S3 image queries
2010-11-17 15:01:41 -05:00
6400374986
SH-432 mesh viewer will not run on OSX 10.5.8
...
Rebuilt the collada library on a 10.5 machine. this should fix the issue,
as the problem was we were building against a version of libxml2 that was
specific to 10.6. Will update to use a non-system version of the lib
later.
2010-11-17 13:59:17 -05:00
Nyx (Neal Orman)