aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobject.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-101-8/+3
| | | | | | | | | | | | | | Viewer 2 texture system" This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d. Conflicts: linden/indra/newview/llsurface.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h
* Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-101-3/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| * port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵Armin Weatherwax2010-09-231-3/+8
| | | | | | | | texture system
* | Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-251-7/+6
| | | | | | | | disappears in patches, part 3: Collapse LL_VO_HOLE_WATER and LL_VO_EDGE_WATER into one LL_VO_VOID_WATER
* | Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-251-9/+10
|/ | | | disappears in patches, part 1
* Ported some minor rendering engine changes from Snowglobe.Jacek Antonelli2010-02-161-1/+0
|
* Ported many texture engine changes from Snowglobe.Jacek Antonelli2010-02-161-1/+1
|
* Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-181-0/+1
|\
| * BROKEN logoff/relog crashing inconsistently on various startup states.Armin Weatherwax2009-07-111-0/+1
| |
* | Second Life viewer sources 1.23.4-RCJacek Antonelli2009-06-131-0/+1
| |
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-1/+4
|/
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-3/+7
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-15/+36
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-2/+0
|
* Second Life viewer sources 1.19.1.2Jacek Antonelli2008-08-151-1/+2
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-16/+14
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-2/+3
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-151-0/+3
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-0/+9
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-151-2/+3
|
* Second Life viewer sources 1.17.0.12Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-151-6/+45
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+645