summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2010-11-08MergeLoren Shih
2010-11-08SH-396 WIP fix mac opensource buildNyx 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
2010-11-05mergeBrad Payne (Vir Linden)
2010-11-05SH-396 WIP mac build broken on mesh-developmentNyx Linden
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)
2010-11-04SH-396 WIP fix mac mesh-development buildNyx Linden
2010-11-04BUILDFIX curl error causes linux build to crash on login.Nyx (Neal Orman)
2010-11-04merging up latest changes from viewer-developmentOz Linden
2010-11-04SH-396 WIP fix mac teamcity build for mesh-developmentNyx Linden
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)
2010-11-04Automated merge up from viewer-developmentLoren Shih
2010-11-04STORM-450 FIXED Incorrect help contexts for Sidebar People tabPaul Guslisty
2010-11-04STORM-261 FIXED Changed line number color in script editor.Andrew Productengine
2010-11-03Reverting fix for SH-391 until it works for all use casesJonathanLinden
2010-11-03Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-03SH-396 FIX mac opensource buildNyx (Neal Orman)
2010-11-03STORM-194 FIXED 'Show' button in inventory offer notification to open 'My Inv...Seth ProductEngine
2010-11-03STORM-536 ADDITIONAL FIX Replaced extra calls to getChild() with using a memb...Seth ProductEngine
2010-11-03STORM-536 FIXED scrolling to collapsed accordion tab with keyboard arrows in ...Seth ProductEngine
2010-11-03Fix for SH-391 'Viewer crash when enabling align planar faces on a mesh obje...JonathanLinden
2010-11-03pull fix for STORM-422Oz Linden
2010-11-03CT-633 WIP ES translation for Viewer 2.3, Set19Eli Linden
2010-11-03SH-281 Make UI in snapshot off by default.Dave Parks
2010-11-03STORM-472 Fixed crash that happened while decoding jpg image.Andrew Productengine
2010-11-02Mergebrad kittenbrink
2010-11-02Bugfix for build.sh overwriting log files when build-link-parallel is disabled.brad kittenbrink
2010-11-02Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-02SH-395 FIX fixes for linux and windows collada librariesNyx (Neal Orman)
2010-11-02STORM-283 : merge with viewer-developmentMerov Linden
2010-11-02STORM-287 : merge with viewer-developmentMerov Linden
2010-11-02STORM-420 : merge to viewer-developmentMerov Linden
2010-11-02Reverting code for fixing non-uniform scale for mesh uploads as it breaks rig...JonathanLinden
2010-11-02STORM-422 FIXED Added command line option "-disablecrashlogger" to disable cr...Vadim ProductEngine