Oz Linden
|
4e0d25720f
|
merge changes for storm-1316
|
2011-06-04 07:48:08 -04:00 |
|
eli_linden
|
f4204d105a
|
FIX VWR-20803
|
2011-06-03 17:06:41 -07:00 |
|
Debi King (Dessie)
|
db2d21a89b
|
reconciled .hgtags
|
2011-06-03 20:03:52 -04:00 |
|
eli_linden
|
6e2095b4f1
|
FIX VWR-20691
|
2011-06-03 17:00:26 -07:00 |
|
Don Kjer
|
c32b0122ab
|
Merge
|
2011-06-03 23:58:58 +00:00 |
|
eli_linden
|
39c4a4a955
|
FIX VWR-20689
|
2011-06-03 16:57:16 -07:00 |
|
Leslie Linden
|
7dbf6ebb74
|
Automated merge with file:///Users/Leslie/work/mesh-development
|
2011-06-03 16:52:04 -07:00 |
|
eli_linden
|
c55e9f3b6d
|
FIX VWR-20668
|
2011-06-03 16:48:17 -07:00 |
|
Debi King (Dessie)
|
eef9016ca1
|
Added tag DRTVWR-61_2.7.1-beta1, 2.7.1-beta1 for changeset 0c4d0c242780
|
2011-06-03 19:43:13 -04:00 |
|
Leslie Linden
|
ffab1eef57
|
Mac build fixes.
Reviewed by davep.
|
2011-06-03 16:24:07 -07:00 |
|
Roxie Linden
|
bc014c2e9e
|
automated merge
|
2011-06-03 14:34:00 -07:00 |
|
Don Kjer
|
357062a196
|
Added build params for mesh-asset-deprecation
|
2011-06-03 19:46:34 +00:00 |
|
Jonathan Yap
|
cc7a041bfe
|
Fix for Storm-956 crashes viewer when connected to non-LL grids
|
2011-06-03 14:41:08 -04:00 |
|
callum
|
d034bdcae7
|
(EXP-871) FIX Add a WARNING to comment for BrowserEnableJSObject and set to no persist between sessions
|
2011-06-03 10:59:26 -07:00 |
|
Xiaohong Bao
|
75bdb77c24
|
more fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)
|
2011-06-03 10:55:28 -06:00 |
|
Xiaohong Bao
|
c701a0d9c2
|
Merge
|
2011-06-03 10:50:14 -06:00 |
|
Dave Parks
|
f4722b3905
|
merge
|
2011-06-03 00:15:56 -05:00 |
|
Dave Parks
|
b0a04b08f7
|
SH-1744 Add havok's degenerate triangle check to importer. Highlight degenerate triangles in physics mesh and block upload when degenerate triangles are present.
|
2011-06-03 00:13:50 -05:00 |
|
Dave Parks
|
b77e027fcc
|
Remove some unused variables.
|
2011-06-02 23:46:26 -05:00 |
|
Dave Parks
|
837dd6e943
|
merge
|
2011-06-02 22:59:18 -05:00 |
|
Dave Parks
|
de5f93ca52
|
SH-1732 Add streaming cost calculation for mesh objects.
|
2011-06-02 22:58:57 -05:00 |
|
Oz Linden
|
4a3916630c
|
merge changes back from beta branch for SH-1691
|
2011-06-02 17:34:12 -04:00 |
|
Richard Linden
|
960e8c05cb
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-06-02 13:35:15 -07:00 |
|
Logan Dethrow
|
7b949262fe
|
Merge.
|
2011-06-02 14:53:58 -04:00 |
|
eli_linden
|
42b6805df9
|
FIX VWR-24130 additional linguistic fix
|
2011-06-02 11:24:22 -07:00 |
|
Xiaohong Bao
|
535842211f
|
Automated merge with http://hg.secondlife.com/mesh-development
|
2011-06-02 12:07:14 -06:00 |
|
Xiaohong Bao
|
d5041f5fb0
|
fix for SH-1691: [crashhunters] crash at LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
|
2011-06-02 12:05:45 -06:00 |
|
Xiaohong Bao
|
71658a024e
|
fix for SH-1691: [crashhunters] crash at LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
|
2011-06-02 12:05:45 -06:00 |
|
seth_productengine
|
d4e09e81ca
|
Linux build fix.
Unused local varible removed.
|
2011-06-02 17:03:51 +03:00 |
|
Dave Parks
|
faef58a9b9
|
SH-1666 Remove "Mesh" stitching type from sculpt combo box.
|
2011-06-02 01:36:28 -05:00 |
|
Dave Parks
|
c8ea9476ad
|
merge
|
2011-06-01 23:55:06 -05:00 |
|
Dave Parks
|
d78ecc6c28
|
SH-812 Fix for rigged meshes not showing up as rigged until LoD switch.
|
2011-06-01 23:54:49 -05:00 |
|
Dave Parks
|
6992dbc1e3
|
SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
|
2011-06-01 23:46:04 -05:00 |
|
Oz Linden
|
361384ebb9
|
merge tags from beta branch
|
2011-06-01 21:41:40 -04:00 |
|
Oz Linden
|
60d32f0a97
|
merge tags from release branch
|
2011-06-01 21:40:33 -04:00 |
|
Oz Linden
|
147567349e
|
pull back fix for storm-1298 from beta branch
|
2011-06-01 19:05:36 -04:00 |
|
Logan Dethrow
|
2662c4b679
|
Merge. Pulling fix for VWR-25862 into bigger cache tree.
|
2011-06-01 17:05:38 -04:00 |
|
Leslie Linden
|
b530648dd4
|
EXP-869 FIX -- Mac viewer should build without requiring settings modifications
Modified cmake GCC_VERSION from 4.2 to 4.0, our officially supported GCC version
Reviewed by Richard
|
2011-06-01 11:46:53 -07:00 |
|
eli_linden
|
9b4fe70eec
|
sync with viewer-development
|
2011-06-01 11:15:57 -07:00 |
|
Xiaohong Bao
|
244f1a3d01
|
fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)
|
2011-06-01 12:09:40 -06:00 |
|
Xiaohong Bao
|
b100f1d2d4
|
fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)
|
2011-06-01 12:09:40 -06:00 |
|
Debi King (Dessie)
|
17edcc939a
|
merged .hgtags
|
2011-06-01 13:57:51 -04:00 |
|
Debi King (Dessie)
|
ffe8417a04
|
Added tag DRTVWR-56_2.6.9-release, 2.6.9-release for changeset 77e5a08344c9
|
2011-06-01 13:52:04 -04:00 |
|
Oz Linden
|
2002a39e4d
|
merge changes for storm-1296
|
2011-06-01 07:22:57 -04:00 |
|
Oz Linden
|
32f795d027
|
merge changes for storm-1304
|
2011-06-01 07:22:02 -04:00 |
|
Oz Linden
|
e9501b855b
|
merge changes for storm-1299
|
2011-06-01 07:21:09 -04:00 |
|
Oz Linden
|
6c9b45f4d6
|
merge changes for new search
|
2011-06-01 07:18:46 -04:00 |
|
Oz Linden
|
6bc63bddee
|
merge changes for new search
|
2011-05-31 22:29:28 -04:00 |
|
eli_linden
|
5142751def
|
FIX VWR-25397
|
2011-05-31 17:02:59 -07:00 |
|
eli_linden
|
ebb6e899a0
|
FIX VWR-24130
|
2011-05-31 16:17:58 -07:00 |