summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Collapse)Author
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Fix gcc ternary type inference fail to unbreak Mac and Linux buildsGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-30Merge downstream code from viewer-bearsimon
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17for SH-4105: interesting: new viewer does not handle orphaned child prims in ↵Xiaohong Bao
ObjectUpdateCompressed messages
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
Added protection for invalid / empty inventory contents
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-03NORSPEC-71 Lots more UI hookupsDave Parks
Written with and Reviewed By Graham
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
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-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
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-15fix crasher in setNumTEsOz Linden
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-04improve and clarify loggingOz 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-30Specular map support. This is the vast majority of the material parameters ↵Geenz
implemented at this point for opaque geometry.
2013-01-28Basic normal mapping support.Geenz
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-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
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-20fix for SH-3151: Some textures not in view load when avatar sits down.Xiaohong Bao
2012-12-18fix for SH-3624: Object deletion does not workXiaohong Bao
2012-12-05fix fo SH-3151: Some textures not in view load when avatar sits down.Xiaohong Bao
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-21Pull and merge https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-19merge with viewer-developmentRichard Linden
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-09MAINT-1755: Correcting behavior when llTargetOmega is called with zero spin ↵William Todd Stinson
rate.
2012-11-09Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-08MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to ↵William Todd Stinson
fix these issues, but then was accidentally re-introduced during a bad merge.
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson