Brad Payne (Vir Linden)
|
3ce04f335e
|
SH-1904 FIX (cherry pick from original by bao)
|
2011-07-18 18:25:47 -04:00 |
|
Don Kjer
|
fde88ae24d
|
Potential fix for SH-1854 and SH-1125 (caps issues)
|
2011-07-14 18:43:49 -07:00 |
|
Dave Parks
|
4e61870f3a
|
merge
|
2011-07-14 01:07:26 -05:00 |
|
Dave Parks
|
561d40d5c3
|
SH-715 Disable simplify/analyze button while counterpart is executing.
|
2011-07-14 01:07:01 -05:00 |
|
Brad Payne (Vir Linden)
|
dd3069127b
|
merge
|
2011-07-13 14:57:23 -04:00 |
|
Don Kjer
|
40a489a9cc
|
Merge
|
2011-07-12 18:10:44 -07:00 |
|
Don Kjer
|
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 |
|
Dave Parks
|
685c98275c
|
merge
|
2011-07-12 17:31:37 -05:00 |
|
Dave Parks
|
104748b59a
|
SH-1125 Retry when failing to get seed capability.
|
2011-07-12 17:31:25 -05:00 |
|
Xiaohong Bao
|
c45c603eee
|
Automated merge with http://hg.secondlife.com/mesh-development
|
2011-07-12 14:48:34 -06:00 |
|
Xiaohong Bao
|
5d25338ed0
|
fix for SH-2040: Missing '?: 0' and old style object/prim counts under Edit linked when Mesh disabled
|
2011-07-12 14:42:56 -06:00 |
|
Dave Parks
|
5a767e4ceb
|
merge
|
2011-07-12 14:07:26 -05:00 |
|
Dave Parks
|
bb44da4613
|
SH-2050 Hide UI that breaks down upload fee and rename some fields.
|
2011-07-12 14:07:09 -05:00 |
|
Xiaohong Bao
|
502f01bfef
|
Automated merge with http://hg.secondlife.com/mesh-development
|
2011-07-12 13:07:00 -06:00 |
|
Brad Payne (Vir Linden)
|
18cce53c4c
|
merge
|
2011-07-12 14:46:04 -04:00 |
|
Brad Payne (Vir Linden)
|
496c81401d
|
SH-2049 FIX
|
2011-07-12 14:39:15 -04:00 |
|
Brad Payne (Vir Linden)
|
77e2be7984
|
SH-2043 FIX
|
2011-07-12 14:35:32 -04:00 |
|
Dave Parks
|
8a28549694
|
merge
|
2011-07-12 13:22:38 -05:00 |
|
Dave Parks
|
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 |
|
Dave Parks
|
ec0ee4f7c8
|
SH-2052 Fix for reported PE being too low when selecting more than 500 objects.
|
2011-07-12 12:04:58 -05:00 |
|
Xiaohong Bao
|
b8351e83e8
|
fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"
|
2011-07-11 17:51:16 -06:00 |
|
Oz Linden
|
44c7c6feaa
|
merge changes for storm-1315
|
2011-07-11 16:52:00 -04:00 |
|
Oz Linden
|
121d004b32
|
merge changes for storm-1459
|
2011-07-11 16:51:06 -04:00 |
|
Oz Linden
|
7b9fc42941
|
merge changes for storm-1325
|
2011-07-11 16:49:29 -04:00 |
|
prep
|
4b3ed516fc
|
Fix for sh-1982 and sh-2025
|
2011-07-11 14:55:07 -04:00 |
|
prep
|
b905b231c9
|
merge
|
2011-07-11 13:52:46 -04:00 |
|
prep
|
572a1734a5
|
SH-2012: removed upload wizard from inventory '+' menu
|
2011-07-11 13:51:20 -04:00 |
|
Brad Payne (Vir Linden)
|
80e60371f8
|
Fix for linux build failure, hopefully
|
2011-07-11 11:33:05 -04:00 |
|
Oz Linden
|
c94bc42892
|
increment viewer version to 2.8.1
|
2011-07-11 08:44:19 -04:00 |
|
Oz Linden
|
1927214e66
|
Added tag 2.8.0-start for changeset e1ed60913230
|
2011-07-11 08:43:23 -04:00 |
|
Oz Linden
|
8529c37dee
|
merge changes for storm-1488
|
2011-07-11 06:16:19 -04:00 |
|
Oz Linden
|
58e09b5f52
|
merge changes for chop-661
|
2011-07-11 06:14:46 -04:00 |
|
Oz Linden
|
b5f00fd120
|
merge changes for storm-1481
|
2011-07-11 06:13:07 -04:00 |
|
Oz Linden
|
d190a02db8
|
merge changes for storm-1472
|
2011-07-11 06:12:36 -04:00 |
|
Oz Linden
|
f34e5f761f
|
merge changes for storm-1483
|
2011-07-11 06:11:49 -04:00 |
|
Dave Parks
|
97ba99b3c0
|
merge
|
2011-07-10 00:18:04 -05:00 |
|
Don Kjer
|
782c8a48f1
|
Added L$ price breakdown for model uploads
|
2011-07-09 19:50:36 -07:00 |
|
Dave Parks
|
33cf789134
|
merge
|
2011-07-09 17:01:59 -05:00 |
|
Dave Parks
|
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 |
|
Don Kjer
|
121c4034db
|
Merge
|
2011-07-09 14:58:31 -07:00 |
|
Don Kjer
|
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 |
|
Brad Payne (Vir Linden)
|
961d5b1d65
|
merge
|
2011-07-09 11:05:29 -04:00 |
|
Nat Goodspeed
|
02cfd17236
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-07-09 10:57:22 -04:00 |
|
Oz Linden
|
b40a44d24d
|
increment version to 2.8.0
|
2011-07-09 07:58:11 -04:00 |
|
Dave Parks
|
7b102270f5
|
SH-2007 Don't eat an entire core when uploading meshes or requesting fee information.
|
2011-07-08 23:32:30 -05:00 |
|
Dave Parks
|
dd6547a55e
|
merge
|
2011-07-08 23:22:07 -05:00 |
|
Dave Parks
|
dc7100a63f
|
SH-2008 Fix for crash when generating normals on objects with no texture coordinates.
|
2011-07-08 23:21:51 -05:00 |
|
Oz Linden
|
9ee4051df0
|
merge changes for storm-1491
|
2011-07-08 22:10:07 -04:00 |
|
Don Kjer
|
e63dd834ab
|
Merge viewer-development -> mesh-development
|
2011-07-08 18:26:08 -07:00 |
|
Don Kjer
|
b9d6b5ef9a
|
Merge viewer-development -> mesh-development
|
2011-07-08 18:25:07 -07:00 |