summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Expand)Author
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
2010-04-01Automated MergeRoxie Linden
2010-04-01Fixed line endingMatthew Breindel (Falcon)
2010-04-01MergeMatthew Breindel (Falcon)
2010-04-01DEV-47845 More cleanup. Fixed a bug where the physics shape type wouldn't get...Matthew Breindel (Falcon)
2010-03-31MergeMatthew Breindel (Falcon)
2010-03-31DEV-47845 Cleaned up names.Matthew Breindel (Falcon)
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29Merge latest viewer-hotfix, approximately equal to Viewer 2.0 finalJames Cook
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-26DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so...Matthew Breindel (Falcon)
2010-03-25automated mergeLoren Shih
2010-03-25EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-20mergeDave Parks
2010-03-19EXT-6421 [crashhunters] Crash in LLViewerObject::getBoundingBoxAgent()Karl Stiefvater (qarl)
2010-03-08Merge with viewer 2 beta 4James Cook
2010-02-26Removed unnecessary include llhudtext.h from llviewerobject.hJames Cook
2010-02-25Support multiple fonts, colors and styles in name tagsJames Cook
2010-02-25LOD tweaking (sort of) works again in importer.Dave Parks
2010-02-13resolve.Tofu Linden
2010-02-13Backed out changeset d89b00b44ab6Tofu Linden
2010-02-12mergePalmer Truelson
2010-02-12Backed out davep's optimization pass. changeset 3c3685de430aPalmer Truelson
2010-02-12mergePalmer
2010-02-23mergePalmer Truelson
2010-02-23Turning on Davep optimizations again. Backed out changeset d89b00b44ab6Palmer Truelson
2010-02-05EXT-4739 - Crash on teleport after viewer minimize. Making sure we don't acc...Eric M. Tulla (BigPapi)
2010-02-03Optimization pass.Dave Parks
2010-01-27CID-111Tofu Linden
2010-01-27CID-112Tofu Linden
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-25automated merge from trunkRoxie Linden
2009-11-30Linker optimization - use "extern template" for commonly regenerated templatesJames Cook
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
2009-10-16svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-05DEV-40650: Refactor llmediadataresponder and llmediadatafetcher into a single...Rick Pasetto
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-09-25SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. ThisMartin Reddy
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 08:22:38 +0000