summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.h
AgeCommit message (Expand)Author
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-11Mergeskolb
2009-12-11EXT-2718 avatar render cost higher in 2.0 than in 1.23Nyx (Neal Orman)
2009-12-10PARTIAL DEV-43869: LLMediaDataClient now uses two queuesRick Pasetto
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-24mergeLoren Shih
2009-11-24Fix for copying of tetrahedrons in place of mesh LODs.Dave Parks
2009-11-23EXT-2718 EXT-2434 avatar render cost changesNyx (Neal Orman)
2009-11-19Added LLVOVolume::markDead(), which unhooks any prim media instances from the...Monroe Linden
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
2009-11-12EXT-2434 update avatar rendering costNyx (Neal Orman)
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-10FIX DEV-41991: do not allow media settings panel to come up if media data is ...Rick Pasetto
2009-11-06Partial fix for DEV-42153.Monroe Linden
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-21DEV-41600: one last change: rename INTERACT and CONTROl to MEDIA_PERM_INTERAC...Rick Pasetto
2009-10-21DEV-41600 Refactored my previous change based on review feedback from monroeRick Pasetto
2009-10-19Fix for a case where the webkit plugin never generates a LOCATION_CHANGED eve...Monroe Linden
2009-10-09Unit tests for LLMediaDataClientRick Pasetto
2009-10-07DEV-39168 - bounce back to the current URL (or, the home URL if current URL i...Rick Pasetto
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-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-06-27fix for DEV-27483/SEC-283: Viewer crash: LLXform::setParent Creating loop whe...Xiaohong Bao
2009-06-23Fixed a bunch of missing includes and forward declares. I was trying to benc...James Cook
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-23svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-pi...Karl Steifvater
2008-07-22svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> re...Josh Bell
2008-07-22merge uv-picking branch.Karl Steifvater
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-04svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-09svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-07merge -r 58751:58843 maintenance -> releaseSteven Bennetts
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-02Print done when done.James Cook