aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/CMakeLists.txt (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'remotes/github/weekly' into weeklyMcCabe Maxsted2011-02-181-0/+4
|\
| * Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-11-231-0/+4
| |\
| | * IMP-701: An API to wrap objects for thread-safe access.Aleric Inglewood2010-11-171-0/+1
| | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/701
| | * IMP-590: Added a thread-safe and robust wrapper for APR pools.Aleric Inglewood2010-11-171-0/+3
| | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/590
* | | Merge branch 'armin/weekly' into weeklyJacek Antonelli2011-02-091-0/+2
|\ \ \ | |/ / |/| |
| * | Henri Beauchamp: Display Names support v4Armin Weatherwax2011-01-241-0/+2
| |/
* | Use proper install_name for Mac libllcommon.Jacek Antonelli2010-11-141-0/+9
|/
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-071-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_mergeRobin Cornelius2010-10-101-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 64bitArmin Weatherwax2010-09-231-0/+20
| |
| * llmediaplugins first stepArmin Weatherwax2010-09-231-0/+2
| |
* | RED-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-011-0/+2
|/ | | | See http://redmine.imprudenceviewer.org/issues/556
* Backported clickable object names from 1.23McCabe Maxsted2009-09-111-0/+2
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-0/+7
|
* Second Life viewer sources 1.21.3-RCJacek Antonelli2008-09-281-0/+1
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-0/+188