summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-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-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-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-17SOCIAL-741 FIX Gesture graphic for click to move in-worldRichard Linden
2011-03-17SOCIAL-714 FIX Basic mode to launch with Destinations panel open by defaultRichard Linden
2011-03-17SOCIAL-749 FIX Clicking on world to dismiss context menus causes your avatar ↵Richard Linden
to walk to click
2011-03-17Merge indentation fix up.Dave Parks
2011-03-17MergeDave Parks
2011-03-18STORM-1086 FIXED Agent's own calling card created on startup is placed into ↵Seth ProductEngine
Calling Cards folder. If there is an agent's calling card found within Calling Cards and sub-folders no more copies of this calling card are created.
2011-03-17SH-587 Fix for crash when clicking cancel in model importer.Dave Parks
2011-03-17package .so links needed by linux webkit plugin.Andrew de Laix
2011-03-17Work in progress. Big code cleanup ported from TheShining/avatar-physics ↵Loren Shih
(defunct branch). Added butt and belly.
2011-03-17Automated merge with http://hg.secondlife.com/viewer-pre-betaRichard Linden
2011-03-17Added support for handling an asset that contains a skeletal node which has ↵prep linden
no root node for the scene (yuck). Fix for an upload issue w/simplebot
2011-03-17Fix CHOP-544. Use cwd when creating a process on windows when the ↵Alain Linden
llprocesslauncher's working directory is not set. Currently "" will be passed for the working directory which breaks the launching of the updater script.
2011-03-17merge changes for storm-1016Oz Linden
2011-03-17Automated merge with ssh://hg.lindenlab.com/richard/viewer-socialOz Linden
2011-03-17Autobuild: pull in from jenn_linden/viewer-vs2010Merov Linden