summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-03-21Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-03-21fix DOS line endingsOz Linden
2011-03-21pull updates to the start of 2.6.2 from viewer-developmentOz Linden
2011-03-21increment viewer version to 2.6.2Oz Linden
2011-03-21convert DOS line endingsOz Linden
2011-03-21merge changes for storm-1035Oz Linden
2011-03-21merge changes for storm-971Oz Linden
2011-03-21merge changes for storm-659Oz Linden
2011-03-20Disable auto-glow again, though leave my other tweaks in place for those who ↵Tofu Buzzard
might turn it on.
2011-03-20undo another local change.Tofu Buzzard
2011-03-20revert a bunch of stuff from my local repo so this can go in minimally.Tofu Buzzard
2011-03-20subtler SSAO / better worst-case.Tofu Buzzard
2011-03-20pull STORM-1089 beta fixes to autobuild2010 branchOz Linden
2011-03-19pull STORM-1089 beta fixes back to developmentOz Linden
2011-03-19merged OPEN-39: include Tut.cmake for integration tests (fixes ↵Boroondas Gupte
"bitpack_test.o: No such file or directory" on standalone)
2011-03-19STORM-1019 Resolve merge conflictsJonathan Yap
2011-03-19OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No ↵Boroondas Gupte
such file or directory" on standalone)
2011-03-19merge out latest viewer-developmentOz Linden
2011-03-19SOCIAL-762 FIX Viewer crash if first startup (with cleared settings.xml ↵Richard Linden
file) is in Advanced mode fixed not being able to change to advanced mode on clean install without logging in
2011-03-19SOCIAL-762 FIX Viewer crash if first startup (with cleared settings.xml ↵Richard Linden
file) is in Advanced mode
2011-03-18Pull in viewer-developmentMerov Linden
2011-03-18SOCIAL-762 FIX cannot change to advanced modeRichard Linden
need separate flags for first run and first login
2011-03-18Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-developmentOz Linden
2011-03-18Autobuild : Fix merge snaffu in Json cmake fileMerov Linden
2011-03-18VWR-17527 Spanish translation fix from Irene Munieli_linden
2011-03-18Added more belly bounce. Added butt driver param back in.Loren Shih
2011-03-18STORM-1023, STORM-1022 : pull into viewer-autobuild2010Merov Linden
2011-03-18Autobuild: pull in from jenn_linden/viewer-vs2010Merov Linden
2011-03-18Fixed params for belly morph. Incorrect params were causing distortion in ↵Loren Shih
texture maps.
2011-03-18Took out unnecessary Butt Physics parameter.Loren Shih
2011-03-18Set default parameters.Loren Shih
Renamed various parameters.
2011-03-18pull back changes made in beta prepOz Linden
2011-03-18Variety of fixes for param ranges.Loren Shih
Turned off normal/binormal effects for morphing. Fixed issue where updates were always being sent even if below the change threshold.
2011-03-18Some code cleanup. Changed equations to occur in normalized (0,1) space ↵Loren Shih
instead of parameter space.
2011-03-18Automated merge with ↵Richard Linden
bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.yibew7\http__hg.secondlife.com_viewer-development_t3uwtb.hg
2011-03-18MergeRichard Linden
2011-03-18SOCIAL-760 FIX Make click-drag camera rotation more stableRichard Linden
2011-03-18Removal of dbghelp cruft.brad kittenbrink
Reviewed by alain and nat.
2011-03-18Comments.Loren Shih
2011-03-18Enabling for belly vertical motion.Loren Shih
2011-03-18mergeTofu Buzzard
2011-03-18mergeTofu Buzzard
2011-03-18merge out 2.6.0 changes from viewer-developmentOz Linden
2011-03-17Pull in merov_linden/viewer-autobuild2010Merov Linden
2011-03-17Pull in merov_linden/viewer-autobuild2010Merov Linden
2011-03-17Autobuild: Fix Mac building failure: c-ares linking of mac_updaterMerov Linden
2011-03-17Autobuild: pull in from jenn_linden/viewer-vs2010Merov Linden
2011-03-17Fix for Mac specific compiler error. All enumerants of an enum have to be ↵callum
present in a switch statement if there is no default.
2011-03-17SOCIAL-741 FIX Gesture graphic for click to move in-worldRichard Linden
2011-03-17SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,callum
and Help if S3 content or web content is not available. (Included refs to new LLQtWebKit that supports functionality)