8decd5a4e6
merge
2011-05-02 10:39:37 -04:00
50caebbad7
Added handler for final mesh object upload
2011-05-02 10:39:18 -04:00
ee06fde193
Automated merge with http://hg.secondlife.com/mesh-development
2011-04-29 18:14:32 -06:00
d7954ba38f
fix for SH-688: Viewer crash when uploading a large .dae file and clicking the X button in upper right hand corner of the upload model floater on Mac Build
2011-04-29 15:23:03 -06:00
873bd8ce26
Fix for SH-718
2011-04-28 14:22:11 -04:00
d2d07046b7
Automated merge with http://hg.secondlife.com/mesh-development
2011-04-26 16:43:36 -06:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
cf0aa6981a
fix for sh-1420: the background image at startup is missing from mesh-development and viewer-beta.
2011-04-22 10:24:46 -06:00
0349d1f291
Update convex decomp stub to include latest api changes.
2011-04-22 01:17:19 -05:00
33eb030bc0
Update llconvexdecompositionstub for new package layout.
2011-04-22 00:05:04 -05:00
b15dca2263
merge changes for storm-1095
2011-04-21 20:23:26 -04:00
79dceafdfd
merge changes for storm-1145
2011-04-21 20:22:46 -04:00
b0183ebc65
merge changes for storm-1136
2011-04-21 20:22:11 -04:00
f5c4c89a44
Automated merge with https://hg.secondlife.com/mesh-development
2011-04-21 18:07:36 -04:00
ac40560782
reversing the elimination of the stub build of convexdecomp, as we still need
...
the binary version, even with the full LL source being available. This is because
the binary package of the full version is not redistributable due to having the
havok binaries in it.
2011-04-21 18:07:31 -04:00
62208046ae
merge
2011-04-21 16:37:03 -05:00
58b48137ca
Touch up autobuild xml from merge.
2011-04-21 16:35:09 -05:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
a4decda79b
explicitly enable INSTALL_PROPRIETARY in the Linden configurations
2011-04-21 16:40:16 -04:00
a604bc27e5
restore use of proprietary libs (merge error) in Release builds
2011-04-21 10:12:36 -04:00
d9c7c925da
adding collada and minizip to the libraries we package the viewer with for mac.
2011-04-20 22:35:06 -06:00
120f31502e
merge changes for storm-1183
2011-04-20 20:22:54 -04:00
252cb50c38
merge changes for storm-1088
2011-04-20 20:21:55 -04:00
3f9a2dc4d2
merge changes for storm-1184
2011-04-20 20:19:58 -04:00
fed540d186
Automated merge with http://hg.secondlife.com/mesh-development
2011-04-20 18:11:35 -06:00
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
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
4bbfdd4c1f
SH-1417 Disable occlusion culling for reflection map for now.
2011-04-20 17:13:42 -05:00
ecb8c4e718
SH-1411 Fix for shadows from large objects flickering at odd angles at certain times of day.
2011-04-20 15:37:50 -05:00
f836f67092
correct license headers
2011-04-20 09:19:13 -04:00
47b8d252ff
corrected issue in doc/contributions.txt
2011-04-20 07:13:53 -04:00
c7721b86c6
New openssl package solves permissions problems with Linux build.
...
The original Linux openssl tarball includes libcrypto.so and libssl.so files
with r-xr-xr-x permissions: not even the owning user can modify them. This
causes problems when the Release build tries to 'strip' the viewer and all
associated libraries. Newer openssl tarball fixes permission problems.
The newer openssl package also updates from 0.9.8 to 1.0.0, so have to fix
version numbers in Copy3rdPartyLibs.cmake and viewer_manifest.py too. :-P
Presumably the only reason this hasn't been causing trouble with TC builds is
that the link has been picking up system libraries instead of the ones from
the openssl package.
2011-04-19 21:43:13 -04:00
2866e1d9e1
Update freetype package: previous one had no actual library.
...
Evidently the only reason builds have been succeeding is because the link is
picking up the system freetype library. This could be tricky if it goes out of
sync with the freetype package's header files.
2011-04-19 21:32:10 -04:00
5cf5e4bb88
merge
2011-04-19 16:35:37 -05:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
2556607598
Automated merge with http://hg.secondlife.com/mesh-development
2011-04-19 13:42:13 -06:00
e07d21639b
a try fix for SH-1307: Crash on selection of some meshes.
2011-04-19 13:41:05 -06:00
76f24589cd
merge up to latest viewer-development
2011-04-19 14:46:30 -04:00
4ce6d2d909
increment viewer version to 2.6.6
2011-04-19 14:02:29 -04:00
12b0b52b99
merge
2011-04-19 12:37:27 -05:00
3cb97cb4d7
restoring glod to copy3rdpartylibs.cmake and viewer_manifest.py
2011-04-18 18:48:43 -04:00
a9273b8202
adding collada and minizip to viewer_manifest.py, as it got clobbered in the merge
2011-04-18 18:03:43 -04:00
ea2d89880f
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
2011-04-18 17:03:51 -04:00
130db30b26
adding collada and minizip to the libraries we package the viewer with.
2011-04-18 17:03:46 -04:00
d78a925f8f
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
2011-04-18 14:10:17 -06:00
e968760014
more fix for the libminizip issue for linux.
2011-04-18 14:09:58 -06:00
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
b8069d1c25
Added tag 2.6.4-start for changeset f632f87bb71b
2011-04-18 09:19:05 -04:00
d1ba34a8ad
STORM-1088: corrected fix loading of winmm.dll
2011-04-17 11:25:00 -04:00
26b15973af
STORM-1088: fix loading of winmm.dll
2011-04-17 08:04:02 -04:00
Brad Payne (Vir Linden)