aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvovolume.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
| * Applied RLVa-1.1.2-Imprudence.patch by Kitty BarnettMcCabe Maxsted2010-10-091-0/+4
| |
* | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-101-310/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-113/+311
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-112/+310
| | | | | | | | texture system
| * llmediaplugins first stepArmin Weatherwax2010-09-231-1/+1
| |
* | Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)McCabe Maxsted2010-09-251-3/+9
|/
* Ported many texture engine changes from Snowglobe.Jacek Antonelli2010-02-161-120/+79
|
* Merged almost-final version of Imprudence 1.2 into 1.3McCabe Maxsted2009-11-081-4/+4
|\
| * Applied RLVa-1.0.5e_20091107_Imprudence-1.2.0-diff.patchMcCabe Maxsted2009-11-071-4/+4
| |
* | Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-181-2/+14
|\ \ | |/
| * Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.Jacek Antonelli2009-09-041-2/+14
| | | | | | | | Made a few non-functional changes to help it apply.
* | Second Life viewer sources 1.23.4-RCJacek Antonelli2009-06-131-0/+11
| |
* | Second Life viewer sources 1.23.3-RCJacek Antonelli2009-06-131-9/+34
| |
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-327/+410
|/
* Second Life viewer sources 1.22.9-RCJacek Antonelli2009-02-131-5/+5
|
* Second Life viewer sources 1.22.6-RCJacek Antonelli2009-01-281-5/+12
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.22.2-RCJacek Antonelli2008-12-091-1/+1
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-31/+90
|
* Second Life viewer sources 1.21.3-RCJacek Antonelli2008-09-281-0/+1
|
* Second Life viewer sources 1.21.2-RCJacek Antonelli2008-09-121-2/+9
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-19/+59
|
* Second Life viewer sources 1.20.10Jacek Antonelli2008-08-151-16/+0
|
* Second Life viewer sources 1.20.9Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.20.4Jacek Antonelli2008-08-151-8/+12
|
* Second Life viewer sources 1.20.3Jacek Antonelli2008-08-151-1/+11
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-7/+49
|
* Second Life viewer sources 1.19.1.2Jacek Antonelli2008-08-151-4/+16
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-380/+351
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-2/+2
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.6.2-RCJacek Antonelli2008-08-151-1/+2
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-0/+3
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-151-3/+3
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-151-1/+3
|
* Second Life viewer sources 1.17.1.0Jacek Antonelli2008-08-151-6/+8
|
* Second Life viewer sources 1.16.0.5Jacek Antonelli2008-08-151-8/+118
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-36/+19
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-151-603/+1059
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+2046
generated by cgit v1.1 at 2025-02-21 08:48:14 +0000