Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-22 | 1 | -0/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Barnett | McCabe Maxsted | 2010-10-09 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'mccabe-plugins' into plugins_merge | Robin Cornelius | 2010-10-10 | 1 | -7/+7 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -7/+7 |
| | | |||||
* | | SNOW-86: Dangerous macro leads to possible wrong code | Aleric Inglewood | 2010-10-01 | 1 | -1/+1 |
|/ | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/571 This patch appeared to already have been partially applied. I added more semi-colons after all llendl (and LLENDL) macros, and wrapped the lllog ... llendl construct into do { ... } while(0) as is usual for macros that mimic a single statement. The patch was double checked with regular expression greps and a compile. | ||||
* | Fixed regression of #245 | McCabe Maxsted | 2010-09-06 | 1 | -0/+3 |
| | |||||
* | Added basic File menu to notecards (save, import, export) and made the ↵ | McCabe Maxsted | 2010-07-15 | 1 | -25/+20 |
| | | | | script editor File menu consistent with it. TODO: create new notecard format that includes attached inventory | ||||
* | Fixed #245: Script compile error from OpenSim crashes Imprudence | McCabe Maxsted | 2010-04-26 | 1 | -1/+4 |
| | |||||
* | Added menus from BetterNotecardFloater Cool Viewer patch. | McCabe Maxsted | 2010-03-11 | 1 | -0/+4 |
| | | | | | Patch by Henri Beauchamp. (slviewer-0-v12350-BetterNotecardFloater.patch) | ||||
* | Applied Kitty Barnett's patch for Search/Replace in notecards. | McCabe Maxsted | 2010-03-11 | 1 | -152/+13 |
| | |||||
* | Applied SNOW-378: debug setting to compile inventory scripts in Mono | McCabe Maxsted | 2010-01-08 | 1 | -1/+8 |
| | |||||
* | Added script creation resource to the script editor's help menu | McCabe Maxsted | 2009-12-26 | 1 | -0/+29 |
| | |||||
* | Merged almost-final version of Imprudence 1.2 into 1.3 | McCabe Maxsted | 2009-11-08 | 1 | -6/+6 |
|\ | |||||
| * | Applied RLVa-1.0.5e_20091107_Imprudence-1.2.0-diff.patch | McCabe Maxsted | 2009-11-07 | 1 | -6/+6 |
| | | |||||
* | | Merged working branch of 1.2 into LL 1.23 merge | McCabe Maxsted | 2009-10-18 | 1 | -0/+84 |
|\ \ | |/ | |||||
| * | Added script load/save from Meerkat viewer | McCabe Maxsted | 2009-10-12 | 1 | -0/+64 |
| | | |||||
| * | Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch. | Jacek Antonelli | 2009-09-04 | 1 | -0/+20 |
| | | | | | | | | Made a few non-functional changes to help it apply. | ||||
* | | Second Life viewer sources 1.23.0-RC | Jacek Antonelli | 2009-04-30 | 1 | -54/+66 |
|/ | |||||
* | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.22.0-RC | Jacek Antonelli | 2008-12-01 | 1 | -8/+7 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 1 | -117/+188 |
| | |||||
* | Second Life viewer sources 1.20.7 | Jacek Antonelli | 2008-08-15 | 1 | -5/+5 |
| | |||||
* | Second Life viewer sources 1.20.2 | Jacek Antonelli | 2008-08-15 | 1 | -93/+80 |
| | |||||
* | Second Life viewer sources 1.19.1.2 | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.19.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -55/+43 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -9/+9 |
| | |||||
* | Second Life viewer sources 1.18.6.4-RC | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.18.6.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -3/+3 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -31/+53 |
| | |||||
* | Second Life viewer sources 1.18.3.2-RC | Jacek Antonelli | 2008-08-15 | 1 | -7/+39 |
| | |||||
* | Second Life viewer sources 1.18.1.2 | Jacek Antonelli | 2008-08-15 | 1 | -10/+22 |
| | |||||
* | Second Life viewer sources 1.17.0.12 | Jacek Antonelli | 2008-08-15 | 1 | -5/+5 |
| | |||||
* | Second Life viewer sources 1.15.1.3 | Jacek Antonelli | 2008-08-15 | 1 | -12/+16 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 1 | -33/+280 |
| | |||||
* | Second Life viewer sources 1.14.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -222/+317 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 1 | -0/+2007 |