summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
AgeCommit message (Collapse)Author
2013-03-22Automated merge with ↵Richard Linden
bundle:d:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.sp0eps\ssh__richard@hg.lindenlab.com_richard_viewer-interesting-metrics_5o81ck.hg
2013-03-22merge with viewer-releaseRichard Linden
2013-03-18MergeXiaohong Bao
2013-03-13MAINT-2410 Extra Particle Parameters -- viewer implementationDave Parks
Reviewed by Kelly and Graham
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 ↵Richard Linden
LLTrace clearer Count becomes CountStatHandle Count.sum becomes sum(Count, value), etc.
2013-02-28for SH-3824: interesting: Ensure viewer can handle object updates from ↵Xiaohong Bao
entire region gracefully
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 ↵Brad Payne (Vir Linden)
place, avoid querying textures for which we have no authoritative data where they live
2013-01-25setMaterialParams for LLViewerObjectGeenz
2013-01-25Trying to set materials up for rendering! Yay!Geenz
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-08MergeXiaohong Bao
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
further compile error fixes
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
attempted fix for gcc compile errors can't use typeid() on a class that doesn't have a method defined in a translation unit fix is to force classes deriving from LLMemTrackable to use their own static member named sMemStat
2012-12-18fix for SH-3624: Object deletion does not workXiaohong Bao
2012-12-18SH-3468 WIP add memory tracking base classRichard Linden
created memory tracking trace type instrumented a few classes with memory tracking
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
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 ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in ↵Dave Parks
LLViewerObjectList::update, fix for error in llpolymorph
2012-09-13MAINT-1561: BUGFIX Another target omega fix for an issue detected with a ↵William Todd Stinson
clock pendulum.
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
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
Reviewed by me. (Bao created)
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
the viewer.
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 ↵Todd Stinson
for PATH-542. The viewer calculated rotation resulting from an object's angular velocity was being incorrectly reset when the corresponding object update was received. With this bugfix, the rotation resulting from the angular velocity is accumulated separately and is re-appplied when the object update resets the object's rotation.
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 ↵Todd Stinson
volume-detect. Note that this will require Andrew's corresponding server-side change to take effect. However, the viewer change alone should have no neative effect prior to the server being updated.
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)
If we support server side texture baking, requests for baked textures will go through the http url received at login.
2012-07-06MAINT-1228 FIX Can not put more than one object into the contents of an objectcallum
Reviewed by Paul PE
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 20:32:17 +0000