summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
AgeCommit message (Expand)Author
2013-03-22merge with viewer-releaseRichard Linden
2013-03-18MergeXiaohong Bao
2013-03-13MAINT-2410 Extra Particle Parameters -- viewer implementationDave Parks
2013-03-11for SH-3979: interesting: can not edit objects with new object cache codeXiaohong Bao
2013-03-11mergeprep
2013-03-07for SH-3937: interesting: implement the new cache probe logicXiaohong Bao
2013-03-06renamed LLTrace stat gathering classes/methods to make the structure of LLTra...Richard Linden
2013-02-28for SH-3824: interesting: Ensure viewer can handle object updates from entire...Xiaohong Bao
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-01-30SH-3800 WIP - logic to detect baked textures being sought in the wrong place,...Brad Payne (Vir Linden)
2013-01-25setMaterialParams for LLViewerObjectGeenz
2013-01-25Trying to set materials up for rendering! Yay!Geenz
2013-01-24merging in viewer-beta.Nyx Linden
2013-01-08MergeXiaohong Bao
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2012-12-18fix for SH-3624: Object deletion does not workXiaohong Bao
2012-12-18SH-3468 WIP add memory tracking base classRichard Linden
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix a...prep
2012-11-19merge with viewer-developmentRichard Linden
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-09Initial pass at getting a list of viewer objects with non-null material IDs.William Todd Stinson
2012-09-20Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-...William Todd Stinson
2012-09-20reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in LLViewerObjectList::u...Dave Parks
2012-09-13MAINT-1561: BUGFIX Another target omega fix for an issue detected with a cloc...William Todd Stinson
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the re...William Todd Stinson
2012-09-06Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-05Merge viewer-development -> VirLinden/sunshineDon Kjer
2012-09-04merge changes for DRTVWR-207Oz Linden
2012-08-31merge changes forOz Linden
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
2012-08-22mergeBrad Payne (Vir Linden)
2012-08-20merge back beta fixesOz Linden
2012-08-14PATH-842: Another tweak to get the llSetTargetOmega functionality working in ...Todd Stinson
2012-08-08mergeBrad Payne (Vir Linden)
2012-08-08merge changes for DRTVWR-189Oz Linden
2012-08-06PATH-842, VWR-29431: BUGFIX Correcting a regression introduced by the fix for...Todd Stinson
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-13merge changes for DRTVWR-179Oz Linden
2012-07-12Removing debug settings that were in place for pathfinding simulator testing.Todd Stinson
2012-07-12PATH-807: Adding an additional check for if the object is marked as volume-de...Todd Stinson
2012-07-11Fix merge issues - duplicate insertions of codesimon@Simon-PC.lindenlab.com
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-09SH-3171 FIX switched texture pipeline to use the new cap request URLNyx (Neal Orman)
2012-07-06MAINT-1228 FIX Can not put more than one object into the contents of an objectcallum
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com