summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-03-31merge out alains fix for qtwebkit reversionOz Linden
2011-03-31pull in linux build fixes for STORM-1121Oz Linden
2011-03-31d'oh, forgot to add back some q libs to the build when reverting to older ↵Andrew de Laix
linux package; here they are.
2011-03-30STORM-1121 : Suppress the debug cmake instructionMerov Linden
2011-03-30merge llqtwebkit fix for linuxOz Linden
2011-03-30STORM-1121 : Simplify dependencies for llimage_libtestMerov Linden
2011-03-30pull latest changes from viewer-developmentOz Linden
2011-03-30STORM-987 : cmake fixes so that llimage_libtest builds correctly on Mac with ↵Merov Linden
autobuild
2011-03-30remove lib requirement not in current llqtwebkit linux archive.Andrew de Laix
2011-03-29STORM-987: Make building of llimage_libtest optional so that builf failure ↵Merov Linden
on Linux doesn't block autobuild merge
2011-03-29Pull from lindenlab/viewer-developmentMerov Linden
2011-03-29Automated merge with file:///Users/oz/Work/V-DOz Linden
2011-03-29merge changes for storm-1019Oz Linden
2011-03-29merge changes for storm-1086Oz Linden
2011-03-29merge changes for storm-1077Oz Linden
2011-03-29pull back beta changes to viewer-developmentOz Linden
2011-03-29INTL-34 WIP Set22 translations DE ESeli_linden
2011-03-29VWR-24128 FIX ESeli_linden
2011-03-29VWR-24907 FIX ES translationeli_linden
2011-03-29VWR-24908 WIP shorten ES translation but may still require resizingeli_linden
2011-03-29STORM-1119 WIP shorten ES translationeli_linden
2011-03-29VWR-24911 FIXeli_linden
2011-03-29merge changes for storm-1097Oz Linden
2011-03-29INTL-34 WIP Set22 translations FReli_linden
2011-03-28get naming of openallib right when packaging.Andrew de Laix
2011-03-28well, that didn't work. Rollback..Andrew de Laix
2011-03-28Automated merge with https://bitbucket.org/merov_linden/viewer-autobuild2010Andrew A. de Laix
2011-03-28fix CHOP-402: use newer api call for move to trash that will rename if needed.Andrew A. de Laix
2011-03-28mergealain@945battery-guestA-183.lindenlab.com
2011-03-28fix openal linking of viewer.alain@945battery-guestA-183.lindenlab.com
2011-03-28SOCIAL-703 FIX fix name attribute for translated fileseli_linden
2011-03-28increment viewer version to 2.6.3Oz Linden
2011-03-27merge changes for storm-987Oz Linden
2011-03-27merge out latest changes from viewer-developmentOz Linden
2011-03-25STORM-987 : Fix the creation of images in local dirMerov Linden
2011-03-25STORM-1021 : pull into viewer-developmentMerov Linden
2011-03-25STORM-1030 : pull into viewer-developmentMerov Linden
2011-03-25STORM-36 : pull into viewer-developmentMerov Linden
2011-03-25revert packaging of openal libs.alain@945battery-guestA-183.lindenlab.com
2011-03-25Backed out changeset 6e69fbe64617alain@945battery-guestA-183.lindenlab.com
2011-03-24STORM-1104 : pull into viewer-developementMerov Linden
2011-03-24Pull from viewer-betaMerov Linden
2011-03-24STORM-1077 Removed disabling speak hint on mouse up of speak buttonJonathan Yap
2011-03-24use vivox's openal for SLVoice because it isn't compatible with latest ↵alain@945battery-guestA-183.lindenlab.com
OpenAl version (should fix linux voice issues).
2011-03-24STORM-1077 Change hint wording. Disable hint if speak or flyout button is ↵Jonathan Yap
pressed.
2011-03-24merge changes for storm-1018Oz Linden
2011-03-23STORM-1077 Eliminated separator bar between Speak Button and other menu entries.Jonathan Yap
2011-03-23Pull from lindenlab/viewer-developmentMerov Linden
2011-03-23STORM-1021 ADDITIONAL_FIX Replaced usual object inspector with the remote ↵Vadim ProductEngine
one in nearby chat toasts.
2011-03-23SyncMerov Linden