summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 10Vadim ProductEngine
Eliminated more merge artifacts.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 9Vadim ProductEngine
Removed dead code.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 8Vadim ProductEngine
Eliminated more merge artifacts (superflous copyright changes).
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 7Vadim ProductEngine
Removed a duplicate line (a merge artifact) from newview/CMakeLists.txt to fix the Mac build.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 6Vadim ProductEngine
* Made it possible to update a region sky preset with the Save button. * Fixed resetting day cycle when you start editing region environment settings. * Fixed: if you press "Cancel Changes" in the region envitonment settings and then choose to resume editing in the confirmation dialog, you won't be able to cancel your changes later.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 5Vadim ProductEngine
* Added "Apply Local to Region" button to the region terrain setttings panel. * Fixed previewing presets via a combomox in the Advanced Sky Editor floater.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 4Vadim ProductEngine
Changes: * Fixed incorrect way to pass parameters to notifications. * Fixed crashes in the Advanced Sky floater and the Region Terrain panel. * Fixed initialization and multiple instantiation of the Day Cycle floater (that might lead to incorrect behavior). * Fixed and re-enabled committing env. settings changes to region. * Fixed day cycle and sky settings being sent as empty arrays and therefore not passing validation on server. It is now possible to change region environment settings. * Added debug messages.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 3Vadim ProductEngine
Added missing (lost in merge) buttons, notifications and strings.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 2Vadim ProductEngine
Added the "Use Region Environment Settings" checkbox and the "Use Local Time" button back to the environment editor.
2011-03-31STORM-1126 WIP Windlight Estate Settings integration: pass 1Vadim ProductEngine
Fixed Environment Editor, Advanced Sky and Day Cycle Editor floaters layout by reverting a bad merge from Viewer 1.23 codebase.
2011-03-30Change in physics parameter names.Loren Shih
Split some physics parameters into separate accordions based on updown/leftright. Fixed a minor issue with physics edit tab height.
2011-03-30STORM-1121 : Suppress the debug cmake instructionMerov Linden
2011-03-30Increased butt physics range.Loren Shih
Added more logic to not center camera during edit physics mode.
2011-03-30Corrections for butt motion in avatar_lad.xml.Loren Shih
Reduced extent of belly motion.
2011-03-30Cleanup to logically group physics params in avatar_lad.xml.Loren Shih
Added more controls for belly & butt. Cleaned up code around physics parameter initialization.
2011-03-30Changes to better logically group avatar_lad.xml physics params.Loren Shih
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-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-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-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