summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-03-30Automated merge with ↵Richard Linden
bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.l2uc4d\http__bitbucket.org_merov_linden_viewer-autobuild2010_j2aqwu.hg
2011-03-30STORM-1117 FIXED Disabled placing calling cards in prims inventory.Seth ProductEngine
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-30STORM-1094 Added 2 lines so new IM windows pick up the font settingJonathan Yap
2011-03-29merged latest improvements from seraphOz Linden
2011-03-29Fixed some labels, and made some labels/wearables hidden in edit.Loren Shih
Added accordions for physics.
2011-03-29Fix for labels not showing up in edit params anymore (accidentally took out ↵Loren Shih
the code that displayed them).
2011-03-29A bit of rearchitecture so that we can have edit wearables that don't have ↵Loren Shih
associated snapshots. Needed to support physics wearables, which don't use a snapshot.
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-29STORM-1072 FIXED [TRANSLATED BUT IN EN] in "Monde" > "Profil du lieu" > "À ↵Paul ProductEngine
propos des terrains" > "Réglement" : "Estate / Full Region" is in english. - Linked region_type string value with translation in strings.xml. If translation for region_type string is absent set unlocalized version (not MissingString text as usual)
2011-03-28Automated merge with file:///F:\code\viewer-autobuild2010Richard 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-28fix for mac/linux?Richard Linden
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-28SOCIAL-821 FIX Move hint comes up immediately when launching viewerRichard Linden
2011-03-28SOCIAL-823 FIX Performing click to walk or click to drag actions do not ↵Richard Linden
remove move hint in Basic mode
2011-03-28mergealain@945battery-guestA-183.lindenlab.com
2011-03-28fix openal linking of viewer.alain@945battery-guestA-183.lindenlab.com
2011-03-28fix for linux and macRichard Linden
2011-03-28catchup with viewer-developmentEli Linden
2011-03-28SOCIAL-703 FIX fix name attribute for translated fileseli_linden
2011-03-28merge late fix for SOCIAL-778 into 2.6.1 for releaseOz Linden
2011-03-28merge up from viewer-autobuild2010 through the start of 2.6.3Oz Linden
2011-03-28merge up from viewer-development through the start of 2.6.3Oz Linden
2011-03-28increment viewer version to 2.6.3Oz Linden
2011-03-27merge changes for storm-987Oz Linden
2011-03-27pull in latest changes from autoubuild2010 branchOz Linden
2011-03-27merge out latest changes from viewer-developmentOz Linden
2011-03-25mergeRichard Linden
2011-03-25SOCIAL-717 FIX Artwork for click to move hintRichard Linden
updated resize logic for hint popups to accomodate image size
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