summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-11-17Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-17SH-480 FIX meshes are not added to objects folder on uploadNyx (Neal Orman)
curl host scrubbing was causing object creation for mesh prims to fail. Commenting out the offending lines so we can have a functional release. Will file a separate bug for Vir to investigate when/if we can re-enable host scrubbing on these URLs for a future release. Approach approved by davep.
2010-11-17mergeBrad Payne (Vir Linden)
2010-11-17SH-476 FIX. Map tiles were failing when numeric addrs were substituted in ↵Brad Payne (Vir Linden)
amazon S3 image queries
2010-11-17SH-432 mesh viewer will not run on OSX 10.5.8Nyx Linden
Rebuilt the collada library on a 10.5 machine. this should fix the issue, as the problem was we were building against a version of libxml2 that was specific to 10.6. Will update to use a non-system version of the lib later.
2010-11-17Implemented support for parsing bone offsets from a Collada file when no ↵prep linden
skeletal node is present.
2010-11-16Automated merge with https://hg.secondlife.com/mesh-developmentNyx Linden
2010-11-16SH-432 WIP mac build of mesh-development is brokenNyx Linden
Was able to rebuild collada and pcre with architecture i386, which is our officially supported architecture. This should unstick the build in theory.
2010-11-15mergeprep
2010-11-15Implemented support for getting at the child translational element if the ↵prep
SID fails to resolved.
2010-11-15Backed out changeset: 1c9c6cdcccdeprep
2010-11-15Implemented support for getting at the child translational element if the ↵prep
SID fails to resolved.
2010-11-15SH-396 WIP mac build not working on mesh-developmentNyx Linden
last build of collada didn't have ppc architecture, which is required for running on 10.4 / 10.5 (was able to build it without ppc when building only for 10.6).
2010-11-12BUILDFIX allow curl host name scrub to work on non-windows platformsNyx (Neal Orman)
Needed an include for gethostbyname to be called properly.
2010-11-12mergeBrad Payne (Vir Linden)
2010-11-12SH-275 FIX: non-production grids now default to different source of map tilesBrad Payne (Vir Linden)
2010-11-12SH-331 WIP updating colladadom to work for mac on mesh-developmentNyx Linden
Tried building a colladadom package for mac that will run on both 10.5 and 10.6 fingers crossed.
2010-11-11mergeDave Parks
2010-11-11Fix for crash in curl.Dave Parks
2010-11-10cleanupprep
2010-11-10Bug fix for an avatar that would exhibit floating if pelvis was offsetprep
Bug fix for attach/detach so that it will recalculate certain avatar settings based upon bone positions.
2010-11-08Fix for manual merge errors.Loren Shih
2010-11-08Manual merge of llviewerwindow.cpp from mesh-development.Loren Shih
2010-11-08Backout merge of llviewerwindow; need to do manual merge since this is messy.Loren Shih
This checkin causes llviewerwindow to become the viewer-development version.
2010-11-08MergeLoren Shih
2010-11-08SH-396 WIP fix mac opensource buildNyx Linden
Missed a reference to libcollada in viewer_manifest. Hopefully should be packaged and set properly now.
2010-11-08removed unused variableBrad Payne (Vir Linden)
2010-11-05BUILDFIX: commented out unused variable which breaks the mac build.Nyx Linden
2010-11-05Automated merge with https://hg.secondlife.com/mesh-developmentNyx Linden
2010-11-05SH-396 FIX mac build on mesh-development is brokenNyx Linden
Adding collada to the list of libraries we need to package with the viewer Not sure why this wasn't here earlier, but this should solve the packaging problem.
2010-11-05mergeBrad Payne (Vir Linden)
2010-11-05SH-396 WIP mac build broken on mesh-developmentNyx Linden
Finally fixed collada dynamic library location issue. Should fix mac build if the library is being packaged properly.
2010-11-05mergeBrad Payne (Vir Linden)
2010-11-05additional analysis for --analyzeperformance optionBrad Payne (Vir Linden)
2010-11-05Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-05BUILDFIX making curl asserts llinfos for non-windows platformsNyx (Neal Orman)
linux curl appears to throw an initialization error once per session after login. Can't hunt it down right now, so making curl asserts llinfos for non-windows platforms. Also added a new assert on curl initialization.
2010-11-04SH-396 WIP fix mac mesh-development buildNyx Linden
Fixed the mac references to Collada14Dom.dylib I think. Fingers crossed!
2010-11-04BUILDFIX curl error causes linux build to crash on login.Nyx (Neal Orman)
Switching curl errors from llerrs to llinfos allows the client to continue on its merry way. Will file a jira to follow up later on why the error happens in the first place.
2010-11-04merging up latest changes from viewer-developmentOz Linden
2010-11-04SH-396 WIP fix mac teamcity build for mesh-developmentNyx Linden
making sure we're copying over the necessary 3rd party library in the packaging stage
2010-11-04automated merge from http://hg.secondlife.com/viewer-betaLoren Shih
2010-11-04automated merge up from viewer-betaLoren Shih
2010-11-04Pushing 2.3.0-beta2 tag to repoDessie Linden
2010-11-04Added tag 2.3.0-beta2 for changeset db0fe9bb6518Dessie Linden
2010-11-04merge fix for STORM-450Oz Linden
2010-11-04merge fix for STORM-261Oz Linden
2010-11-04merge fix for STORM-194Oz Linden
2010-11-04merge fix for STORM-536Oz Linden
2010-11-04SH-396 FIX fix mac build on mesh-development branchNyx (Neal Orman)
autobuild recently changed to not upload to s3 without an explicit command-line argument. Re-uploaded (this time to s3) colladadom for mac, and updated install.xml
2010-11-04Automated merge up from viewer-developmentLoren Shih