4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
1c7b1532e9
Merge from viewer-experience
2011-09-08 10:55:48 -07:00
08c0de785f
merge
2011-09-06 09:42:11 -04:00
da7f2af75c
Fix for model metrics
2011-09-01 17:47:05 -04:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
cb09994ae2
merging in latest mesh-development
2011-08-18 19:17:34 -04:00
f7d17cad5c
SH-2188 Fix for generally bad vertex buffer updates for rigged attachments and fix for viewer always thinking meshes initially have 8 texture entries.
2011-08-17 12:55:32 -05:00
5318730343
FIX SH-859, SH-1274 - added fix for determining triangle count and
...
performance tested impact of animated textures
Also did some cleanup to ensure branch built and ran properly after
last merge.
2011-08-16 17:51:11 -04:00
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
6732f5fbca
merge viewer-development to mesh-development
2011-08-10 17:53:11 -04:00
20c3d84854
Submitted correction for logic error: if decomp fails for single hull only execute fallback code
2011-08-10 12:50:12 -04:00
7633b3f1f1
SH-2201 Fix for crash when getting mesh estimates.
2011-08-04 23:42:41 -05:00
5451af6cca
SH-2202 FIX physics costs have increased
...
Changed the default to use low LOD for single hull generation, will fall back to medium or high if not present.
2011-08-02 18:04:58 -04:00
74d5b08dea
fix for SH-2144: [PUBLIC] Hi-resolution model that don't upload.
2011-08-02 14:59:30 -06:00
ce0a1f39aa
SH-1941 FIXED Mesh upload menu enabled when avatar is in the region that does not allow building but supports mesh upload.
2011-07-25 17:58:35 +03:00
50b9c63382
SH-1868 WIP Added user-supplied metric data for uploading a model.
...
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.
The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
2011-07-22 22:40:18 +03:00
7ef1550fbb
merge
2011-07-18 23:50:50 -05:00
3ce04f335e
SH-1904 FIX (cherry pick from original by bao)
2011-07-18 18:25:47 -04:00
5707ccf570
fix for SH-1904: Medallion .dae makes viewer crash during upload
2011-07-18 12:09:32 -06:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
40a489a9cc
Merge
2011-07-12 18:10:44 -07:00
4e16dc26ab
Changes to support SH-1894: Textures uploaded with Mesh do not appear in inventory. Reviewed by Andrew
2011-07-12 18:10:17 -07:00
502f01bfef
Automated merge with http://hg.secondlife.com/mesh-development
2011-07-12 13:07:00 -06:00
922bc0aa6a
SH-2053 Don't poke the UI from a background thread -- it tends to get crashy.
2011-07-12 13:22:01 -05:00
33cf789134
merge
2011-07-09 17:01:59 -05:00
29d5413ea6
SH-2007 Code cleanup, expand minimum header size to 4KB, better comments around magic numbers, remove dead calcResourceCost
2011-07-09 17:01:33 -05:00
7029c8ff53
Fix for SH-2028. Also fixed layout issues with new upload warning and upload price text when floater is resized.
2011-07-09 14:58:14 -07:00
7b102270f5
SH-2007 Don't eat an entire core when uploading meshes or requesting fee information.
2011-07-08 23:32:30 -05:00
2a6e18d147
SH-1774 Fix for preserving material assignments between multiple custom LoDs.
2011-07-07 18:32:42 -05:00
a9600e5e0d
fix for SH-1808: uploading warthog model triggers LLPhysicsDecomp::doDecompositionSingleHull warnings
...
SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-07 10:51:13 -06:00
0400143b4d
fix for SH-1808: uploading warthog model triggers LLPhysicsDecomp::doDecompositionSingleHull warnings
...
SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-07 10:51:13 -06:00
b466e95b4d
merge cleanup
2011-07-05 14:11:16 -04:00
d8d1587d49
merge
2011-07-05 13:15:58 -04:00
ec402fad16
SH-1747 mesh-asset-dep -- uploaded objects have bad permissions, and SH-1975 Name of mesh is not loaded into mesh uploader floater. Also removed a lot of dead mesh uploader code.
2011-07-03 01:02:01 -07:00
d2fe45b877
Automated merge with https://bitbucket.org/seth_productengine/mesh-development
2011-07-01 16:41:52 -04:00
8accd2cc04
SH-1725 SH-1726 FIX mesh upload wizard & advanced don't handle upload errors gracefully
...
Restructured the code to be a bit cleaner, now have callbacks with appropriate functionality
in both the wizard and advanced uploaders. If the upload fails, it requires the user to
re-submit the recalculate request.
2011-07-01 16:39:49 -04:00
4bce553a96
merge viewer-development -> mesh-development
2011-07-01 09:41:10 -04:00
3da45a3cd1
merge
2011-07-01 10:09:03 -04:00
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
17060f4e92
SH-1332 Remaining mesh wizard upload work
...
adding observer classes for the upload step so we don't move to success state until upload succeeds.
2011-06-30 15:55:19 -04:00
e4b12b83e8
SH-1725 WIP Added upload permissions and fee requests to Upload Model Wizard.
...
- Enabled warning for users without upload permissions.
- Enabled "Calculate weights & fee" button.
- Temporarily enabled to upload meshes if upload permission capability request has failed.
2011-06-29 22:03:29 +03:00
cc73cf15e6
Merge latest from lindenlab/viewer-development
2011-06-29 11:36:19 -07:00
19c13b55d7
SH-1873 FIXED updating L$ balance after uploading meshes.
2011-06-29 17:10:30 +03:00
fc6f0f31be
SH-1726 FIXED (Viewer modifications to advanced model upload to accommodate upload fee & prim equivalency)
...
- Changed XUI according to the spec
- Added requesting upload permission, physics weight and fee weight
- Split requesting fee and uploading model steps in mesh repository
2011-06-29 17:22:18 +03: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
af142618f9
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-06-23 11:35:14 -07:00
Dave Parks