Dave Parks
03d22f5366
SH-1913 Fix for PE cost not updating appropriately when editing child prims of a linked set.
2011-07-01 12:24:52 -05:00
Dave Parks
a1fb8ae0d0
merge
2011-06-30 18:19:37 -05:00
Dave Parks
38778fcc61
SH-680 Update streaming cost to be based on a triangle budget instead of a magic scaler.
...
Reviewed by Nyx.
2011-06-30 18:19:09 -05:00
Nyx (Neal Orman)
a5d7485cdc
Automated merge with https://hg.secondlife.com/mesh-development
2011-06-28 15:36:34 -04:00
Nyx (Neal Orman)
41f3080d93
SH-1917 SH-1935 FIX PE cost is not always shown, includes unnecessary digits
...
Reformatted line showing prim equiv values, formatted to an integer,
removed old Render Cost display, and updated label of new display.
2011-06-28 15:36:26 -04:00
Dave Parks
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
prep linden
57581b682f
Fix for SH-1919 - help button added
2011-06-28 11:10:40 -04:00
Brad Payne (Vir Linden)
3b05866653
merge
2011-06-27 18:26:12 -04:00
Dave Parks
4df70b5523
SH-1899 Check mesh asset version before attempting to parse.
2011-06-27 12:22:28 -05:00
Dave Parks
1c4df782ec
merge
2011-06-27 10:40:02 -05:00
Dave Parks
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
Oz Linden
5c9fc7d24f
increment viewer version to 2.7.6
2011-06-27 09:04:20 -04:00
Oz Linden
311a431169
Added tag 2.7.5-start for changeset 19a498fa6257
2011-06-27 09:03:33 -04:00
Oz Linden
ca89422fb3
merge changes for storm-1443
2011-06-26 07:25:49 -04:00
Xiaohong Bao
d46d74dbea
fix for SH-1904: Medallion .dae makes viewer crash during upload
2011-06-24 17:42:34 -06:00
Xiaohong Bao
3161143977
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-24 15:28:34 -06:00
Xiaohong Bao
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
prep linden
e7c5913c05
Bug fixes for SH-1791
2011-06-24 15:21:50 -04:00
eli_linden
44308a50c2
sync with viewer-development
2011-06-24 11:09:26 -07:00
Xiaohong Bao
c3ac5be995
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-24 11:44:48 -06:00
eli_linden
11eb995e69
FIX VWR-25660 en_xui_change
2011-06-23 16:28:59 -07:00
eli_linden
6c18a086f3
FIX VWR-25408
2011-06-23 15:44:36 -07:00
eli_linden
cf5e9841a7
FIX VWR-25400
2011-06-23 15:39:55 -07:00
eli_linden
47f1f3f396
FIX VWR-25381
2011-06-23 15:23:30 -07:00
eli_linden
5f3c4f7e19
FIX VWR-25125
2011-06-23 14:47:07 -07:00
Brad Payne (Vir Linden)
887516ca4c
merge viewer-development to mesh-development
2011-06-23 17:39:04 -04:00
Oz Linden
02995303e9
merge changes for storm-899
2011-06-23 14:09:13 -04:00
Oz Linden
b343d25d19
merge changes for storm-1437
2011-06-23 09:47:43 -04:00
Xiaohong Bao
97ef8e0ea0
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-22 16:07:47 -06:00
Dave Parks
b0fdc44951
SH-1815 Fix for crash when using old version slm
2011-06-22 16:08:23 -05:00
prep
6629a77cac
merge
2011-06-22 15:55:39 -04:00
prep
0961c3baaa
WIP SH-1791 - constructAndAddReturnable() now accepts target region
2011-06-22 15:54:16 -04:00
Brad Payne (Vir Linden)
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
Brad Payne (Vir Linden)
7bf28da663
merge
2011-06-22 15:06:33 -04:00
prep linden
4caf151c5a
WIP for SH-1791
2011-06-22 13:36:21 -04:00
Brad Payne (Vir Linden)
2da45d0237
merge
2011-06-22 13:36:17 -04:00
Xiaohong Bao
ab27913cc9
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-22 10:51:11 -06:00
Oz Linden
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
Oz Linden
c8232b6595
update codeticket configuration for my review builds
2011-06-22 11:36:52 -04:00
Oz Linden
a5474e3398
remove a bunch of builds that are no longer needed
2011-06-22 11:30:18 -04:00
Oz Linden
9a2e35f7ca
merge changes for storm-1421
2011-06-22 08:30:59 -04:00
Jonathan Yap
3ef49a967b
STORM-899 [ILL-FORMED XML] 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales
...
Added / to xml file
2011-06-22 06:27:51 -04:00
Squire
80b81279a2
CHOP-662 Merged into viewer-development-crash-horde
2011-06-21 21:42:32 -07:00
Squire
84c44b8f8e
STORM-1368 Merge with veiewer-development-crash-horde
2011-06-21 21:40:54 -07:00
Squire
8c65351250
Pulled from viewer development
2011-06-21 20:50:16 -07:00
Squire
14105610c7
CHOP-662 cleanup in response to code review.
2011-06-21 20:46:32 -07:00
eli_linden
c0fa40141b
FIX VWR-25160 en_xui_change
2011-06-21 16:15:58 -07:00
eli_linden
54195e8125
FIX VWR-25159
2011-06-21 16:07:28 -07:00
eli_linden
2a3a01dcc9
FIX VWR-25118
2011-06-21 15:40:13 -07:00
Nyx (Neal Orman)
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