summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-12-13merge fixes from 3.4.3-beta3Oz Linden
2012-12-13merge changes for DRTVWR-267Oz Linden
2012-12-13merge changes for DRTVWR-244Oz Linden
2012-12-13Fixed whitespace issues for merge.Aura Linden
2012-12-13MAINT-2109 Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions for LSL ↵Maestro Linden
scripts and script information floater. Reviewed by Andrew.
2012-12-13merge changes for DRTVWR-266Oz Linden
2012-12-13Fix line endings.Kelly Washington
2012-12-13MAINT-1995 Names of banned and allowed residents are not shown in Access tab ↵Kelly Washington
of the About Land dialog Code by Richard, reviewed by merov and kelly
2012-12-12sync with viewer-developmenteli
2012-12-12MAINT-2086 Separate GPU class from settings more completely to avoid GPU ↵Dave Parks
dependent behavior when manually adjusting detail slider.
2012-12-12MAINT-2087 Cleanup XML changes from new preferences hash marksDave Parks
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-12MAINT-2082: fix deletion of an autoreplace listOz Linden
2012-12-12MAINT-2051: Implement replacement of an existing autoreplace listOz Linden
2012-12-11Merged from viewer-releaseAura Linden
2012-12-11MAINT-1028 Fix for gccDave Parks
2012-12-11MAINT-1028 Fix for crash when importing meshes produced by FBX converterDave Parks
2012-12-11Crash reporter fixed, debugging removed.Aura Linden
2012-12-11Interim debug checkin to test from teamcityAura Linden
2012-12-10MAINT-1345 Fix for some mesh outfits showing the wrong LoD initiallyDave Parks
2012-12-10merge changes for DRTVWR-260Oz Linden
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-07MAINT-2053 Fix for garbangles on rigged attachments.Dave Parks
2012-12-07Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-12-07Optimization -- falcon says not using static here is more performant.Dave Parks
2012-12-07MAINT-2040 Remove leftover debug spam.Dave Parks
2012-12-06Added compiled AutoUpdater.nib made from new AutoUpdater.xibAura Linden
2012-12-06Fixed several minor issues with validation.Aura Linden
2012-12-06MAINT-1874 : Viewer needs more logging for ScriptTeleportRequest message. Addedsimon@Simon-PC.lindenlab.com
log message.
2012-12-05merge changes for MAINT-1955Nat Goodspeed
2012-12-05merge changes for DRTVWR-259Nat Goodspeed
2012-12-05merge changes for MAINT-1951Nat Goodspeed
2012-12-05Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-12-05MAINT-1760 Fix for opaque water glowing when wearing certain rigged attachments.Dave Parks
2012-12-05Automated merge with https://bitbucket.org/lindenlab/viewer-catXiaohong Bao
2012-12-05fix fo SH-3151: Some textures not in view load when avatar sits down.Xiaohong Bao
2012-12-05Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-12-05MAINT-2040 Fix for rigged meshes sometimes not updating properly with color ↵Dave Parks
changes.
2012-12-05merge changes for DRTVWR-257Nat Goodspeed
2012-12-05merge changes for MAINT-1953Nat Goodspeed
2012-12-05merge changes for DRTVWR-258Nat Goodspeed
2012-12-05merge changes for MAINT-1979Nat Goodspeed
2012-12-05merge changes for DRTVWR-256Nat Goodspeed
2012-12-05merge changes for MAINT-1955, MAINT-1958Nat Goodspeed
2012-12-05merge changes for DRTVWR-254Nat Goodspeed
2012-12-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04merge changes for BUG-768Nat Goodspeed
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com