summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
AgeCommit message (Collapse)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-05-09Mergesimon
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18NORSPEC-90 Cleanup avatar alpha shadersDave Parks
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-14Rollback Maestro interp changesGraham Madarasz (Graham Linden)
2013-03-14Remove hard-coded cam distance hackGraham Madarasz (Graham Linden)
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-03-08Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.Graham Madarasz (Graham)
2013-03-05For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.Graham Madarasz (Graham)
2013-03-04Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-03-04MAINT-2371 More optimizations.Dave Parks
Reviewed by Graham
2013-03-04For MAINT-2423 fix regression from CHUI merge. Code review: DavePGraham Madarasz (Graham)
2013-02-28Modify LLInstanceTracker to avoid using a map of strings to find a map of ↵Graham Madarasz (Graham)
foo to find some pointers
2013-02-13Merge from viewer-betaprep
2013-02-12remove obsolete LLMemType tracing from materialsOz Linden
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-25Trying to set materials up for rendering! Yay!Geenz
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break tanks. Reverts MAINT-1742
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-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
2013-01-16MAINT-2247 Child object does not update rotation while selected.Kelly Washington
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-21MAINT-1950 Fix for offscreen objects not getting rebuilt sometimes.Dave Parks
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-lionDave Parks
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-17MAINT-1742 Child object does not update position while selected.Kelly Washington
reviewed with Davep
2012-10-16Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-10pull back 3.4.1-beta6 fixesOz Linden
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-10DRTVWR-225 Cleanup assertionsDave Parks
2012-10-10Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.William Todd Stinson
2012-10-02Fix up some assertions in lloctree.hDave Parks
2012-09-20reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.Dave Parks
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-20reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctreeDave Parks