dc918c66d1
SH-704 Potential fix for crash in LLModelPreview::calcResourceCost.
2011-01-21 18:26:22 -06:00
e7f068c37e
Automated merge from mesh-development
2011-01-13 10:23:47 -05:00
e47ff7bd47
SH-717 Viewer crash on exit after Upload model dialog could not be spawned
...
Took out unused function that was seen in crash report from this bug. No functionality change.
2011-01-12 17:35:31 -05:00
d51d294296
Merge
2011-01-12 13:44:55 -08:00
3a47555dc2
SH-777 Wizard top buttons need to be clickable and switch between wizard steps
2011-01-12 13:38:47 -08:00
86482ce1d7
merge
2011-01-11 16:42:24 -05:00
997c0d3924
SH-742 FIX, SH-743 FIX: now treat requesting a specific triangle limit differently from changing some other LOD parameter, to avoid successive simplification problem
2011-01-11 16:39:28 -05:00
b63a404613
Merge
2011-01-10 12:10:36 -08:00
c4989c17ed
Automated merge from mesh-development
2011-01-10 11:20:28 -05:00
e8423f150f
Added support for parsing a matrix sids translation elements for joints
2011-01-10 11:04:13 -05:00
6e671281a2
SH-759 FIXED Various crashes in model floater after you open file picker then cancel
...
Took out erroneous logic for handling when a file picker is canceled.
Reviewed by Davep.
2011-01-07 17:16:28 -05:00
5237226522
Merge
2011-01-06 16:43:57 -08:00
f243f7e550
added callback for updating wizard dimensions and costs from the model preview
...
properly enabling/disabling wizard buttons
xml ui fixes
2011-01-06 16:42:18 -08:00
5b09da5079
Fix for SH-579
2011-01-05 16:07:16 -05:00
b70a8ee0da
fixed line endings again
2011-01-05 10:37:28 -05:00
875d36b083
merge
2011-01-05 01:23:37 -06:00
4a29253a59
Automated merge with http://hg.secondlife.com/mesh-development
2011-01-04 16:50:42 -07:00
961e50aab4
clear some LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist.
2011-01-04 16:22:38 -07:00
33d9b10fbb
SH-727 Working cancel button and cancel buttons for physics decomp stages.
2010-12-31 16:48:50 -06:00
350a736d37
Merge
2010-12-31 12:55:04 -08:00
d196348d0f
Physics stage of wizard
2010-12-31 12:53:39 -08:00
e3204165b9
automated merge
2010-12-30 22:09:16 -08:00
ca9df698db
Code review fix from davep - use booling or operator and not binary one
...
Remove unnecessary state check.
Initial dialog work for showing physics cost in upload dialog
2010-12-30 22:08:25 -08:00
13ec64e0e6
SH-714 Fix for skinned meshes being incorrectly scaled.
2010-12-30 16:07:18 -06:00
6262c4a427
SH-632 Fix for auto generating mesh LODs sometimes reducing High LOD triangle count.
2010-12-29 15:48:59 -06:00
2651cfc271
merge
2010-12-22 15:19:58 -06:00
07d3480ec3
SH-658 Preserve LOD mode when switching between preview LoDs.
2010-12-22 15:18:55 -06:00
3aa7b9f83e
Automated merge with http://hg.secondlife.com/mesh-development
2010-12-22 10:56:27 -07:00
8ba0baa631
fix for SH-648: Crash on exit in LLViewerFetchedTexture (ref count error)
2010-12-22 10:55:48 -07:00
09ff90a118
Update llconvexdecomposition and fix gcc compiler error
2010-12-22 03:15:56 -06:00
171307ded9
merge
2010-12-22 01:05:52 -06:00
e1b1db9575
SH-636 Update physics tab to new spec, move "completed" physics decomp callbacks to main thread, add object model to decomposition tool, make imported model scales non-uniform.
2010-12-22 01:05:35 -06:00
6175e8147f
fixed wizard model not previewing issues and added pan/zoom
2010-12-21 17:01:03 -08:00
e7f3f3bdbb
model upload wizard - added optimization and state changes
2010-12-20 17:32:05 -08:00
4bd6edc6b0
SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved onIdle functions to llcallbacklist.
2010-12-20 17:11:34 -05:00
6a0e8fc13e
thread safety checking
2010-12-20 13:52:48 -05:00
ad625861e1
SH-594 - added an extra redundant check for nameless nodes
2010-12-15 17:07:07 -05:00
7926c54a0b
SH-594 FIX: added check for nameless nodes
2010-12-15 16:58:35 -05:00
3f79aad1df
merge
2010-12-14 15:52:46 -05:00
5f8110a68e
SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed
2010-12-14 15:52:26 -05:00
ed25bfc431
BUILDFIX uninitialized variable
...
a potentially uninitialized variable is causing the linux build to fail.
Initializing the value to 0, as its our best guess for what it should
be, as davep is currently out sick.
2010-12-14 14:54:05 -05:00
4a61efdee9
fixed bad line endings
2010-12-13 17:54:39 -05:00
27f11d9868
merge
2010-12-13 17:51:14 -05:00
b76c59a191
SH-653 FIX: upload button now starts out disabled
2010-12-13 13:27:24 -05:00
6f8ff871cd
merge
2010-12-10 20:42:29 -06:00
8e5f15a3b6
Remove redundant call to glodGroupParameteri
2010-12-10 20:41:12 -06:00
2508bb2d85
More correct GLOD usage -- one group, many objects.
2010-12-10 20:40:28 -06:00
285ba51336
fixed model uploader aspect not updating, text not following resize, and file name not filling in
2010-12-10 17:05:38 -08:00
6a599955d1
merge cleanup.
2010-12-10 16:13:41 -06:00
03fa20eb0e
merge
2010-12-10 15:27:04 -06:00
Dave Parks