Xiaohong Bao
|
fed540d186
|
Automated merge with http://hg.secondlife.com/mesh-development
|
2011-04-20 18:11:35 -06:00 |
|
Xiaohong Bao
|
a357815604
|
update the collada lib of Mac to the rev 227230 to fix the missed minizip problem.
|
2011-04-20 18:10:33 -06:00 |
|
Nyx (Neal Orman)
|
87512a6e5d
|
re-applying fix from previous mesh-dev merge branch
SH-1062 FIX Flexi sculpts is a mess until you zoom in.
|
2011-04-20 18:22:02 -04:00 |
|
Xiaohong Bao
|
2556607598
|
Automated merge with http://hg.secondlife.com/mesh-development
|
2011-04-19 13:42:13 -06:00 |
|
Xiaohong Bao
|
e07d21639b
|
a try fix for SH-1307: Crash on selection of some meshes.
|
2011-04-19 13:41:05 -06:00 |
|
Dave Parks
|
12b0b52b99
|
merge
|
2011-04-19 12:37:27 -05:00 |
|
Nyx (Neal Orman)
|
3cb97cb4d7
|
restoring glod to copy3rdpartylibs.cmake and viewer_manifest.py
|
2011-04-18 18:48:43 -04:00 |
|
Nyx (Neal Orman)
|
a9273b8202
|
adding collada and minizip to viewer_manifest.py, as it got clobbered in the merge
|
2011-04-18 18:03:43 -04:00 |
|
Nyx (Neal Orman)
|
ea2d89880f
|
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
|
2011-04-18 17:03:51 -04:00 |
|
Nyx (Neal Orman)
|
130db30b26
|
adding collada and minizip to the libraries we package the viewer with.
|
2011-04-18 17:03:46 -04:00 |
|
Xiaohong Bao
|
d78a925f8f
|
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
|
2011-04-18 14:10:17 -06:00 |
|
Xiaohong Bao
|
e968760014
|
more fix for the libminizip issue for linux.
|
2011-04-18 14:09:58 -06:00 |
|
prep
|
c494e5c0d5
|
WIP for SH-1281. Rigged assets are critiqued differently based upon whether they're avrigs w/wo joint offets and whether the asset contains a subset of the joints in the visual scene
|
2011-04-18 10:41:32 -04:00 |
|
Dave Parks
|
0398e611f2
|
Fix for flycam not overriding focal point properly for DoF effect.
|
2011-04-15 17:46:34 -05:00 |
|
Dave Parks
|
719e3f1483
|
SH-1374 Integrate bokeh depth of field effect from Tofu, but preserve edge detection.
|
2011-04-15 17:40:26 -05:00 |
|
Brad Payne (Vir Linden)
|
17a70ddf8f
|
merge
|
2011-04-15 17:12:42 -04:00 |
|
Brad Payne (Vir Linden)
|
b6ae8b1156
|
moved to public llconvexdecomposition builds
|
2011-04-15 17:12:07 -04:00 |
|
Xiaohong Bao
|
5a3fb5349d
|
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
|
2011-04-15 14:25:57 -06:00 |
|
Xiaohong Bao
|
f9f8479472
|
update collada lib for linux to 226716
|
2011-04-15 14:25:32 -06:00 |
|
Dave Parks
|
af6133dfa5
|
merge
|
2011-04-15 14:13:57 -05:00 |
|
Dave Parks
|
6a49142467
|
Remove some asserts that cause the physics shape display to error out on occasion.
|
2011-04-15 14:12:12 -05:00 |
|
Dave Parks
|
8275820df0
|
SH-1301 Add some extra asserts around VBO usage to try and narrow down a crash.
|
2011-04-15 14:11:48 -05:00 |
|
Brad Payne (Vir Linden)
|
47d4dc301f
|
merge
|
2011-04-15 11:36:43 -04:00 |
|
Brad Payne (Vir Linden)
|
c81ae1a3fa
|
removed separate stub lib, since llconvexdecomposition is going public and includes the stub
|
2011-04-15 11:04:09 -04:00 |
|
prep linden
|
298d71b4d9
|
License update
|
2011-04-15 11:02:57 -04:00 |
|
prep linden
|
2851141ee6
|
merge
|
2011-04-15 10:48:13 -04:00 |
|
prep linden
|
fcfb70f01d
|
License update
|
2011-04-15 10:47:44 -04:00 |
|
Brad Payne (Vir Linden)
|
88ae509ed9
|
merge
|
2011-04-15 10:34:57 -04:00 |
|
Brad Payne (Vir Linden)
|
a0359e3241
|
updated to new llconvexdecomposition build (now with 100% more vs2010)
|
2011-04-15 10:34:23 -04:00 |
|
Xiaohong Bao
|
ed2f4797da
|
update linux glod lib to change 226657.
|
2011-04-14 17:19:25 -06:00 |
|
Xiaohong Bao
|
6b49a5f67c
|
update to the latest glod lib for linux.
|
2011-04-14 15:18:49 -06:00 |
|
Xiaohong Bao
|
77575dae62
|
update to use 32-bit pcre lib for linux.
|
2011-04-14 14:43:56 -06:00 |
|
Leyla Farazha
|
33d0b98b7c
|
SH-1343 Change wizard slider labels
SH-1344 Remove Physics and Upload from any panel where it's not used
|
2011-04-14 11:56:14 -07:00 |
|
Dave Parks
|
75b637d633
|
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
|
2011-04-14 13:24:31 -05:00 |
|
Dave Parks
|
6ec5e332fb
|
Linux build should use 3p-google-perftools build result
|
2011-04-14 13:24:21 -05:00 |
|
Brad Payne (Vir Linden)
|
acf986ee8b
|
merge
|
2011-04-14 14:07:27 -04:00 |
|
Brad Payne (Vir Linden)
|
971b67bf87
|
disable windows debug builds (temporary)
|
2011-04-14 14:06:59 -04:00 |
|
Dave Parks
|
4f3b3abb87
|
autobuild doesn't like comments?
|
2011-04-14 12:36:30 -05:00 |
|
Dave Parks
|
4d395e9e62
|
Linux not windows (whoops)
|
2011-04-14 12:22:01 -05:00 |
|
Dave Parks
|
b4b3c4f763
|
Include glext headers on linux.
|
2011-04-14 11:56:33 -05:00 |
|
Brad Payne (Vir Linden)
|
f92d521b46
|
fixed windows boost library names
|
2011-04-14 11:08:50 -04:00 |
|
Xiaohong Bao
|
7dfa297be1
|
update to use the latest collada lib, which is built on the 32bit pcre lib.
|
2011-04-13 18:08:21 -06:00 |
|
Leyla Farazha
|
1a6908a2d9
|
SH-1299 and SH-1300 Adding mesh enabled checkbox to region floater
|
2011-04-13 16:31:16 -07:00 |
|
Dave Parks
|
dbb7cd6910
|
Fix for bad kdu URLs
|
2011-04-13 16:40:20 -05:00 |
|
Dave Parks
|
c094102445
|
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
|
2011-04-13 16:33:53 -05:00 |
|
Dave Parks
|
bf36625332
|
Fix for bad fmod URL's
|
2011-04-13 16:33:41 -05:00 |
|
Brad Payne (Vir Linden)
|
6db302578a
|
newer glod, colladadom builds on mac
|
2011-04-13 16:58:04 -04:00 |
|
Brad Payne (Vir Linden)
|
7b62a960d1
|
merge
|
2011-04-13 16:50:11 -04:00 |
|
Dave Parks
|
b2d3f5009e
|
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
|
2011-04-13 13:43:43 -05:00 |
|
Dave Parks
|
12f9f521ee
|
Fix for bad default setting and libpng using /GL
|
2011-04-13 13:43:32 -05:00 |