12e08417bf
SH-1169 Fix for convex decompositions not working post mesh-asset-deprecation work. (also default SLM usage to on)
2011-06-28 12:41:12 -05:00
4df70b5523
SH-1899 Check mesh asset version before attempting to parse.
2011-06-27 12:22:28 -05:00
1c4df782ec
merge
2011-06-27 10:40:02 -05:00
d5c784be4e
SH-680 Apply a 128-byte discount per LoD block to cover the cost of metadata.
2011-06-27 10:39:41 -05:00
d46d74dbea
fix for SH-1904: Medallion .dae makes viewer crash during upload
2011-06-24 17:42:34 -06:00
3161143977
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-24 15:28:34 -06:00
f83b08b69c
fix for SH-1878: Viewer hang in GLOD_Group::adaptTriangleBudget during LLModelPreview::genLODs;
...
SH-1891: viewer crashes while previewing "RYOMA 3D XML File.dae";
SH-1890: Crash loading palm tree
2011-06-24 15:09:10 -06:00
e7c5913c05
Bug fixes for SH-1791
2011-06-24 15:21:50 -04:00
c3ac5be995
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-24 11:44:48 -06:00
887516ca4c
merge viewer-development to mesh-development
2011-06-23 17:39:04 -04:00
b343d25d19
merge changes for storm-1437
2011-06-23 09:47:43 -04:00
97ef8e0ea0
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-22 16:07:47 -06:00
b0fdc44951
SH-1815 Fix for crash when using old version slm
2011-06-22 16:08:23 -05:00
6629a77cac
merge
2011-06-22 15:55:39 -04:00
0961c3baaa
WIP SH-1791 - constructAndAddReturnable() now accepts target region
2011-06-22 15:54:16 -04:00
13202345d5
SH-989 FIX - only reject LOD if vertex total is too high, rather than checking mesh-by-mesh. This should make rejections much less common.
2011-06-22 15:43:57 -04:00
7bf28da663
merge
2011-06-22 15:06:33 -04:00
4caf151c5a
WIP for SH-1791
2011-06-22 13:36:21 -04:00
2da45d0237
merge
2011-06-22 13:36:17 -04:00
ab27913cc9
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-22 10:51:11 -06:00
f657e8e16f
remove error from build logs by taking out obsolete param (cg said this was ok to do)
2011-06-22 11:37:46 -04:00
c8232b6595
update codeticket configuration for my review builds
2011-06-22 11:36:52 -04:00
a5474e3398
remove a bunch of builds that are no longer needed
2011-06-22 11:30:18 -04:00
9a2e35f7ca
merge changes for storm-1421
2011-06-22 08:30:59 -04:00
80b81279a2
CHOP-662 Merged into viewer-development-crash-horde
2011-06-21 21:42:32 -07:00
84c44b8f8e
STORM-1368 Merge with veiewer-development-crash-horde
2011-06-21 21:40:54 -07:00
8c65351250
Pulled from viewer development
2011-06-21 20:50:16 -07:00
14105610c7
CHOP-662 cleanup in response to code review.
2011-06-21 20:46:32 -07:00
c0fa40141b
FIX VWR-25160 en_xui_change
2011-06-21 16:15:58 -07:00
54195e8125
FIX VWR-25159
2011-06-21 16:07:28 -07:00
2a3a01dcc9
FIX VWR-25118
2011-06-21 15:40:13 -07:00
e029683826
SH-1476 FIX viewer crashes uploading on linux
...
colladadom was configured to depend on a system library that may not be
up to date on all user's machines. Changed configuration to link statically
against a known version. Verified locally crash does not reproduce.
2011-06-21 18:06:47 -04:00
969a6f9be2
Fix for memory leak & extra inventory observers in start_new_inventory_observer. Reviewed by Richard
2011-06-21 15:02:34 -07:00
00da6b3501
merged back tags and late changes from viewer-pre-beta
2011-06-21 16:58:31 -04:00
687a925fda
pull late release change back from viewer-pre-release
2011-06-21 16:57:27 -04:00
192f51f426
pull back tags from viewer-release
2011-06-21 16:14:10 -04:00
ed684fb2ed
FIX VWR-25072
2011-06-21 12:00:08 -07:00
6977c09a88
FIX VWR-25071
2011-06-21 11:58:54 -07:00
32f8b47497
debug code for SH-692: Viewer Crash when enabling Render Metadata > Physics Shapes on Mesh Sandbox 25 on Windows XP
2011-06-21 12:00:38 -06:00
9afc77ba0a
SH-1719 FIXED Viewer side cleanup of presentation of accounting data in build tools
...
- Moved grid mode combo box to the grid options floater
- Updated UI of the build floater according to the spec
- Fixed "conflict" between LLFloaterOpenHandler and LLFloaterHandler command handlers
2011-06-21 21:00:06 +03:00
fcf2ed5901
merged .hgtags & BuildParams
2011-06-21 11:47:58 -04:00
4d77146b90
Added tag 2.7.4-start for changeset 6af10678de47
2011-06-21 07:25:19 -04:00
226bf6db06
merge
2011-06-20 18:56:49 -05:00
ce02ed3118
SH-1880 partial fix for crashing on daes without UVs.
2011-06-20 18:55:30 -05:00
83b4eb2201
SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.
2011-06-20 16:42:31 -07:00
a975df88f0
Added change to contributions.txt to get code review to work
2011-06-20 16:30:48 -07:00
08fd82ef8f
Automated merge with https://hg.secondlife.com/mesh-development
2011-06-20 17:18:48 -04:00
7201d55396
BUILDFIX: linux build broken - abs() used instead of fabs()
...
linux caught the fact that we're using an integer absolute value function
when we should be using a floating-point version.
2011-06-20 17:18:43 -04:00
f38a42f8cf
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-20 14:04:18 -06:00
aba4f7ddc8
fix for SH-1870: can not upload book_collection_1.dae when include textures
2011-06-20 14:01:32 -06:00
Dave Parks