Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'remotes/github/weekly' into weekly | McCabe Maxsted | 2011-02-18 | 1 | -0/+4 |
|\ | |||||
| * | Merge remote branch 'aleric/weekly' into weekly | McCabe Maxsted | 2010-11-23 | 1 | -0/+4 |
| |\ | |||||
| | * | IMP-701: An API to wrap objects for thread-safe access. | Aleric Inglewood | 2010-11-17 | 1 | -0/+1 |
| | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/701 | ||||
| | * | IMP-590: Added a thread-safe and robust wrapper for APR pools. | Aleric Inglewood | 2010-11-17 | 1 | -0/+3 |
| | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/590 | ||||
* | | | Merge branch 'armin/weekly' into weekly | Jacek Antonelli | 2011-02-09 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Henri Beauchamp: Display Names support v4 | Armin Weatherwax | 2011-01-24 | 1 | -0/+2 |
| |/ | |||||
* | | Use proper install_name for Mac libllcommon. | Jacek Antonelli | 2010-11-14 | 1 | -0/+9 |
|/ | |||||
* | IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins | Aleric Inglewood | 2010-11-07 | 1 | -20/+3 |
| | | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts. | ||||
* | Merge branch 'mccabe-plugins' into plugins_merge | Robin Cornelius | 2010-10-10 | 1 | -0/+22 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Robin Cornelius: fixes for building plugins on Linux 64bit | Armin Weatherwax | 2010-09-23 | 1 | -0/+20 |
| | | |||||
| * | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -0/+2 |
| | | |||||
* | | RED-556: SNOW-800: Massively duplicated objects | Aleric Inglewood | 2010-10-01 | 1 | -0/+2 |
|/ | | | | See http://redmine.imprudenceviewer.org/issues/556 | ||||
* | Backported clickable object names from 1.23 | McCabe Maxsted | 2009-09-11 | 1 | -0/+2 |
| | |||||
* | Second Life viewer sources 1.22.0-RC | Jacek Antonelli | 2008-12-01 | 1 | -0/+7 |
| | |||||
* | Second Life viewer sources 1.21.3-RC | Jacek Antonelli | 2008-09-28 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 1 | -0/+188 |