a68c7c27f9
Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078
2012-06-27 14:43:10 -07:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
1300f77fdd
Merged with viewer-beta
2012-05-20 17:41:00 +02:00
95090c5d1e
merge changes for version 3.3.1
2012-05-08 15:51:56 -04:00
d8b80cdbb6
MAINT-890 Fix for freeze on exit when a mesh upload is pending.
2012-04-09 12:21:38 -05:00
654dd60ca7
merge
2012-03-26 15:41:27 -05:00
6a0eaab160
MAINT-871 Fix for freeze on shutdown while calculating weights and fees of a mesh.
2012-04-13 14:47:30 -05:00
6ecae04d35
SH-2941 Fix for crash on shutdown due to race condition between LLCurl and LLMeshRepository
2012-02-17 15:33:09 -06:00
e0d1ddab21
Merge with viewer-development
2012-02-24 16:12:43 +01:00
4b20d72a99
merge
2012-03-09 13:26:42 -06:00
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
34408bed26
merge
2012-02-01 15:43:11 -05:00
127f6d1405
Fixed up LLVolume memory leak caused by mesh repo thread.
...
Reviewed by Bao.
2012-01-31 16:36:25 -08:00
63398cd531
SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code.
2012-01-24 17:37:20 -06:00
9e621af3db
SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code.
2012-01-24 17:37:20 -06:00
f42c3ff51a
SH-2885 Add mesh requests pending/processing line to "Show Render Info"
2012-01-19 11:10:22 -06:00
f082de03ff
fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory crashes.
2012-01-12 16:36:56 -07:00
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
Kelly Washington