aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobject.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'thickbrick/exp' into expMcCabe Maxsted2011-04-111-2/+8
|\
| * Fix #851: Crash in LLViewerObject::getBoundingBoxAgentthickbrick2011-04-051-2/+8
| | | | | | | | Add some null guards, taken from Snowglobe 2.
* | Ported the GPL version of Zwagoth Klaar's fix for sculpty crashers. This has ↵McCabe Maxsted2011-04-111-2/+11
| | | | | | | | two major side effects: 1. instead of crashing on bad sculpt data, the viewer freezes for a time. 2. Sculpties can be slow to build
* | Added a nullcheck, from Singularity, patch by ShoytlMcCabe Maxsted2011-04-051-1/+1
|/
* load unloaded-avatar-cloud particle system from LLSD file.Armin Weatherwax2010-12-221-1/+1
|
* Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-0/+22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+22
| |
* | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-101-29/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+30
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-6/+29
| | | | | | | | texture system
| * llmediaplugins first stepArmin Weatherwax2010-09-231-1/+1
| |
* | Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-251-2/+1
| | | | | | | | 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-0/+3
|/ | | | disappears in patches, part 1
* Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.eMcCabe Maxsted2010-08-191-1/+1
|
* Always play sounds regardless of maturityMcCabe Maxsted2010-07-161-2/+4
|
* fix: crash on relog; appearence self pie greyed out after relog.Armin Weatherwax2010-04-281-0/+1
|
* Ported some minor rendering engine changes from Snowglobe.Jacek Antonelli2010-02-161-15/+3
|
* Ported many texture engine changes from Snowglobe.Jacek Antonelli2010-02-161-3/+3
|
* Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-181-1/+16
|\
| * Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.Jacek Antonelli2009-09-041-1/+16
| | | | | | | | Made a few non-functional changes to help it apply.
| * Backported 1.23's minimap conversion to XUIMcCabe Maxsted2009-06-091-1/+0
| |
* | Second Life viewer sources 1.23.4-RCJacek Antonelli2009-06-131-0/+16
| |
* | Second Life viewer sources 1.23.3-RCJacek Antonelli2009-06-131-2/+1
| |
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-13/+22
|/
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-28/+54
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-80/+259
|
* Second Life viewer sources 1.20.9Jacek Antonelli2008-08-151-7/+9
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-151-7/+38
|
* Second Life viewer sources 1.20.5Jacek Antonelli2008-08-151-2/+7
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-57/+42
|
* Second Life viewer sources 1.19.1.4bJacek Antonelli2008-08-151-2/+5
|
* Second Life viewer sources 1.19.1.2Jacek Antonelli2008-08-151-2/+7
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-40/+75
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-6/+20
|
* 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-6/+12
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-151-4/+3
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-33/+47
|
* 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-7/+16
|
* Second Life viewer sources 1.17.1.0Jacek Antonelli2008-08-151-24/+61
|
* Second Life viewer sources 1.17.0.12Jacek Antonelli2008-08-151-2/+8
|
* Second Life viewer sources 1.16.0.5Jacek Antonelli2008-08-151-6/+9
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-151-10/+19
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-0/+8
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-151-91/+171
|
* Second Life viewer sources 1.13.2.15Jacek Antonelli2008-08-151-1/+2
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+4666
generated by cgit v1.1 at 2024-11-16 00:18:47 +0000