summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-02mergeBrad Payne (Vir Linden)
2011-05-02Added handler for final mesh object uploadBrad Payne (Vir Linden)
2011-04-29Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-04-29fix for SH-688: Viewer crash when uploading a large .dae file and clicking ↵Xiaohong Bao
the X button in upper right hand corner of the upload model floater on Mac Build
2011-04-28Fix for SH-718prep
2011-04-26Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-04-22mergeDave Parks
2011-04-22fix for sh-1420: the background image at startup is missing from ↵Xiaohong Bao
mesh-development and viewer-beta.
2011-04-22Update convex decomp stub to include latest api changes.Dave Parks
2011-04-22Update llconvexdecompositionstub for new package layout.Dave Parks
2011-04-21merge changes for storm-1095Oz Linden
2011-04-21merge changes for storm-1145Oz Linden
2011-04-21merge changes for storm-1136Oz Linden
2011-04-21Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-04-21reversing the elimination of the stub build of convexdecomp, as we still needNyx (Neal Orman)
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-21mergeDave Parks
2011-04-21Touch up autobuild xml from merge.Dave Parks
2011-04-21mergeDave Parks
2011-04-21explicitly enable INSTALL_PROPRIETARY in the Linden configurationsOz Linden
2011-04-21restore use of proprietary libs (merge error) in Release buildsOz Linden
2011-04-20adding collada and minizip to the libraries we package the viewer with for mac.Xiaohong Bao
2011-04-20merge changes for storm-1183Oz Linden
2011-04-20merge changes for storm-1088Oz Linden
2011-04-20merge changes for storm-1184Oz Linden
2011-04-20Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-04-20update the collada lib of Mac to the rev 227230 to fix the missed minizip ↵Xiaohong Bao
problem.
2011-04-20re-applying fix from previous mesh-dev merge branchNyx (Neal Orman)
SH-1062 FIX Flexi sculpts is a mess until you zoom in.
2011-04-20SH-1417 Disable occlusion culling for reflection map for now.Dave Parks
2011-04-20SH-1411 Fix for shadows from large objects flickering at odd angles at ↵Dave Parks
certain times of day.
2011-04-20correct license headersOz Linden
2011-04-20corrected issue in doc/contributions.txtOz Linden
2011-04-19New openssl package solves permissions problems with Linux build.Nat Goodspeed
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-19Update freetype package: previous one had no actual library.Nat Goodspeed
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-19mergeDave Parks
2011-04-19mergeDave Parks
2011-04-19Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-04-19a try fix for SH-1307: Crash on selection of some meshes.Xiaohong Bao
2011-04-19merge up to latest viewer-developmentOz Linden
2011-04-19increment viewer version to 2.6.6Oz Linden
2011-04-19mergeDave Parks
2011-04-18restoring glod to copy3rdpartylibs.cmake and viewer_manifest.pyNyx (Neal Orman)
2011-04-18adding collada and minizip to viewer_manifest.py, as it got clobbered in the ↵Nyx (Neal Orman)
merge
2011-04-18Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010Nyx (Neal Orman)
2011-04-18adding collada and minizip to the libraries we package the viewer with.Nyx (Neal Orman)
2011-04-18Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010Xiaohong Bao
2011-04-18more fix for the libminizip issue for linux.Xiaohong Bao
2011-04-18WIP for SH-1281. Rigged assets are critiqued differently based upon whether ↵prep
they're avrigs w/wo joint offets and whether the asset contains a subset of the joints in the visual scene
2011-04-18Added tag 2.6.4-start for changeset f632f87bb71bOz Linden
2011-04-17STORM-1088: corrected fix loading of winmm.dllSiana Gearz
2011-04-17STORM-1088: fix loading of winmm.dllSiana Gearz