572a1734a5
SH-2012: removed upload wizard from inventory '+' menu
2011-07-11 13:51:20 -04:00
30a80ac486
Fix for SH-1992
2011-07-07 15:32:38 -04:00
681eb7ba06
Fixes for SH-1994 and SH-2009
2011-07-07 11:35:49 -04:00
9b253ccf68
SH-1972 Fix for slm messing up physics shape on second upload.
2011-07-06 19:27:43 -05:00
71eb68a85d
Fix for "set to default" button not resetting some data.
2011-07-06 18:54:50 -05:00
bab80fed2f
merge
2011-07-06 17:39:32 -04:00
5e5b140ed8
merge
2011-07-06 17:39:01 -04:00
1a5f978ca8
SH-1988 Fix for using diameter instead of radius for streaming cost.
2011-07-06 12:32:44 -05:00
74c5c0a0d7
SH-1945 FIXED Added a check for Estate Managership when checking whether an object encroaching on the region can be returned.
2011-07-06 20:05:38 +03:00
5f17754a39
SH-1965 FIXED recalculating physics in model upload wizard before requesting the upload fee.
2011-07-05 21:21:26 +03:00
b466e95b4d
merge cleanup
2011-07-05 14:11:16 -04:00
e2ddeb5e5f
Fix for SH-1604: missing convex stub license
2011-07-05 13:27:58 -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
cae0915ee6
merge
2011-07-01 17:32:22 -04:00
3cca342ffb
SH-1790 FIX - use the inventory flags returned by server when available
2011-07-01 17:31:53 -04: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
a5a23c3695
merge
2011-07-01 12:25:38 -05:00
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
021ce5ccaf
enabled mesh
2011-07-01 09:42:06 -04:00
4bce553a96
merge viewer-development -> mesh-development
2011-07-01 09:41:10 -04:00
51dcb8476d
SH-1964 FIXED switching to "Review" wizard step upon fee request success and to "Physics" step upon failure.
...
Fixed disabling the final wizard step upon upload failure.
2011-07-01 16:36:25 +03:00
3da45a3cd1
merge
2011-07-01 10:09:03 -04:00
662a927843
merge changes for shining branch
2011-06-30 19:37:56 -04:00
6be68618c4
merge changes for sec-906
2011-06-30 19:20:25 -04:00
a1fb8ae0d0
merge
2011-06-30 18:19:37 -05: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
1716b8428f
Automated merge with https://bitbucket.org/seth_productengine/mesh-development
2011-06-30 15:57:14 -04: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
7a85df9429
merge
2011-06-30 14:00:49 -05:00
06b1202747
- SH-1726 ADDITIONAL FIX (Viewer modifications to advanced model upload to accommodate upload fee & prim equivalency)
...
added the link for "Find out how" in warning text of advanced upload floater
advanced upload, button returns to "get fees" whenever any option that affects price changes
2011-06-30 19:58:27 +03:00
87458cd714
SH-1725 WIP Fixed model wizard making multiple calls to upload permissions check.
...
Fixed truncated warning text.
2011-06-30 19:12:27 +03:00
93d6c921c9
SH-1725 WIP Fixed "Upload" button to be enabled only after recalculating the upload fee and weight.
2011-06-30 16:37:43 +03:00
c7bbe8e631
SH-1726 ADDITIONAL FIX (Viewer modifications to advanced model upload to accomodate upload fee & prim equivilancy)
...
- Added a signal on model change to initiate recalculating (calculate phys&fee button is shown again)
- Show 'calculate phys&fee' button on fee request error
2011-06-30 15:38:58 +03:00
6baafbd549
SH-1725 WIP Fixed displaying upload permissions warning
2011-06-30 15:01:47 +03:00
f07173a968
merge changes for storm-1452
2011-06-30 06:40:46 -04:00
b278b61f4e
merge changes for storm-1406
2011-06-30 06:39:48 -04:00
c8c9384949
merge changes for storm-1327
2011-06-30 06:38:39 -04:00
ce93fc7fd5
merge changes for storm-1396
2011-06-30 06:37:25 -04:00
a80c79097d
merge changes for storm-457
2011-06-30 06:36:25 -04:00
d3a7792703
merge changes for storm-1463
2011-06-29 21:22:59 -04:00
941e055309
merge changes for storm-1423
2011-06-29 21:22:20 -04:00
f6ddd71214
merge changes for storm-1392
2011-06-29 21:21:36 -04:00
b5001ff819
merge changes for storm-1368
2011-06-29 21:20:30 -04:00
baaa3822c7
SH-1726 WIP - prevent upload until sucessful fee request
2011-06-29 18:39:37 -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
0c05ea2740
Fixes for upload permission checking problems
2011-06-29 15:14:49 -04:00
cc73cf15e6
Merge latest from lindenlab/viewer-development
2011-06-29 11:36:19 -07:00
31df1e9319
merge
2011-06-29 13:38:54 -04:00
prep