aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-11-2316-417/+1249
|\
| * IMP-701: An API to wrap objects for thread-safe access.Aleric Inglewood2010-11-174-4/+564
| | | | | | | | See http://redmine.imprudenceviewer.org/issues/701
| * IMP-590: Added a thread-safe and robust wrapper for APR pools.Aleric Inglewood2010-11-1715-416/+688
| | | | | | | | See http://redmine.imprudenceviewer.org/issues/590
* | Use proper install_name for Mac libllcommon.Jacek Antonelli2010-11-141-0/+9
|/
* llstring.h directly depends on #include <map>.Jacek Antonelli2010-11-091-0/+1
|
* IMP-692: SNOW-713: Removed isHexString again, since it is not defined anywhere.Aleric Inglewood2010-11-071-2/+0
|
* IMP-692: SNOW-713: Fixed compile bug fixes.Aleric Inglewood2010-11-071-5/+20
| | | | | | | | | | | | | | | | | | Changes: * Added changes from snowglobe 1.5 to indra/llcommon/llstring.h (compile errors as a result of a missing include, but I copied everything else too). * Added #include "linden_common.h" to emeraldboobutils.cpp. Really it's one the header files that needed that, but that's how this header works: every source file should include it as first header anyway, then there is no need for other headers to do that. * Renamed LLPanelRegionOpenSettingsInfo::sendUpdate(void*) to LLPanelRegionOpenSettingsInfo::onClickOrs because it was hiding a virtual function (BOOL sendUpdate(void)). * Made cutToClipboard more equal to copyToClipboard (was also hiding a virtual function). * Install libllcommon.so in lib64 on Linux_x86_64, instead of lib.
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-0769-324/+362
| | | | | | | | | | 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.
* Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵McCabe Maxsted2010-11-026-3/+461
|\ | | | | | | browser/media plugin support
| * Make LLStringUtilBase<T>::null a constant.Aleric Inglewood2010-11-021-2/+2
| |
| * Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-222-1/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Add support for PluginAttachDebuggerToPlugins for linuxAleric Inglewood2010-10-211-0/+3
| | | | | | | | | | | | | | | Opens a terminal with a gdb session for newly started SLPlugin processes if PluginAttachDebuggerToPlugins is set to TRUE.
| * | Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-105-1/+456
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| | * | port llprimitive from SG2.0Armin Weatherwax2010-09-231-1/+1
| | | |
| | * | llmediaplugins first stepArmin Weatherwax2010-09-234-0/+435
| | | |
* | | | Finishes the OpenRegionSettings module, adds a new panel to Region/Estate ↵RevolutionSmythe2010-11-012-0/+29
| |_|/ |/| | | | | | | | for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
* | | Ported memory leak fix in llcommon/llstring.h from the Ascent ViewerMcCabe Maxsted2010-10-161-0/+1
| | |
* | | Mac Only: Implemented initial CoreGraphics image decoding to support ↵elektrahesse2010-10-091-1/+8
|/ / | | | | | | uploads, both single and bulk, bypassing viewer's internal decoding classes and using osx native frameworks. Also pushing non-fully-working-yet (and thus disabled) code for native j2c decoding.
* | SNOW-86: Dangerous macro leads to possible wrong codeAleric Inglewood2010-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | 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.
* | RED-562: SNOW-422: Imprudence doesn't compile with g++ 4.4.xAleric Inglewood2010-10-011-1/+1
| | | | | | | | See http://redmine.imprudenceviewer.org/issues/562
* | RED-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-018-45/+165
|/ | | | See http://redmine.imprudenceviewer.org/issues/556
* Revert "Updated lltexturecache to the latest in viewer-development (see ↵McCabe Maxsted2010-09-032-44/+3
| | | | | | #425)" since it was causing issues with local assets and object backup This reverts commit 4ca4594ec264f390be981568ef5ff3ff0f2f77e6.
* Updated lltexturecache to the latest in viewer-development (see #425)McCabe Maxsted2010-08-302-3/+44
|
* Fixed some missing constants in the script editor and added ↵McCabe Maxsted2010-08-162-0/+18
| | | | llGetLinkNumberOfSides
* Load other missing UUIDs from OpenSim from file insteadMcCabe Maxsted2010-08-161-10/+10
|
* Applied patch for #424: fix proper detection of Windows 7, backport from ↵McCabe Maxsted2010-08-151-3/+39
| | | | Snowglobe 2.0 by Ansariel Hiller
* Added getZealous to llmorticianMcCabe Maxsted2010-06-192-0/+7
|
* Set the imprudence viewer version in xmlMcCabe Maxsted2010-06-191-3/+10
|
* Release notes and version bump for 1.3.0 beta 4.Jacek Antonelli2010-05-081-1/+1
|
* Updated version to 1.3.0 beta 3.Jacek Antonelli2010-05-011-1/+1
|
* fix bring help-f1 page under control of hippogridmanagerArmin Weatherwax2010-04-122-76/+3
|
* remove link limits: (take 2) depending on grid.Armin Weatherwax2010-04-121-1/+0
| | | | Seems OSim creates several linksets though.
* Bumped version to 1.3.0 beta 2.Jacek Antonelli2010-03-131-1/+1
| | | | @nochangelog
* Robin Cornelius: SNOW-485 Fix deadlock in LLTextureFetchWorker.Armin Weatherwax2010-03-041-7/+18
|
* Aleric Inglewood: SNOW-196 Special case for TextureFetch race condition check.Armin Weatherwax2010-03-042-35/+8
| | | | | | | Where the current UUID was just removed from mRequestMap, thus avoiding to the need for the problematic lock completely. The case that we add something to mNetworkQueue while it was just removed from mRequestMap is corrected by LLTextureFetch::sendRequestListToSimulators anyway.
* Robin Cornelius, Aleric Inglewood: SNOW-196 missing mutexes for texture fetchArmin Weatherwax2010-03-042-1/+13
| | | | | Applys a trylock() abort system to allow the worker thread to avoid deadlocks due to a race between mQueueMutex and mWorkerMutex.
* Bumped version to 1.3.0 beta 1.Jacek Antonelli2010-02-271-1/+1
|
* Ported some stats and texture console changes from Snowglobe.Jacek Antonelli2010-02-161-1/+2
|
* Ported some thread changes from Snowglobe.Jacek Antonelli2010-02-084-23/+31
|
* Ported many APR changes from Snowglobe.Jacek Antonelli2010-02-085-178/+175
|
* Updated version to 1.3.0 "merge test".Jacek Antonelli2010-01-021-3/+3
| | | | (newview/res/viewerRes.rc is already at 1.3.0.)
* Merged SL 1.23.5 into Imprudence.Jacek Antonelli2009-11-282-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/CopyWinLibs.cmake linden/indra/lib/python/indra/util/llversion.py linden/indra/llcommon/llversionviewer.h linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/llassetuploadresponders.cpp linden/indra/newview/llpreview.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/viewer_manifest.py
| * Second Life viewer sources 1.23.5Jacek Antonelli2009-11-032-4/+4
| |
* | Merge branch '1.2-maint' into nextJacek Antonelli2009-11-261-1/+1
|\ \ | | | | | | | | | | | | Conflicts: linden/indra/newview/res/viewerRes.rc
| * | Updated version to 1.2.1McCabe Maxsted2009-11-251-1/+1
| | |
* | | Merge remote branch 'mccabe/1.3.0-next' into nextJacek Antonelli2009-11-19167-532/+1792
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/00-Common.cmake linden/indra/newview/skins/default/xui/de/floater_about.xml linden/indra/newview/skins/default/xui/fr/floater_about.xml linden/indra/newview/skins/default/xui/ja/floater_about.xml linden/indra/newview/skins/default/xui/ko/floater_about.xml linden/indra/newview/skins/default/xui/zh/floater_about.xml linden/install.xml
| * | Viewer compiles, but still trying to get everything to link on WindowsMcCabe Maxsted2009-11-101-0/+1
| | |
| * | Merged almost-final version of Imprudence 1.2 into 1.3McCabe Maxsted2009-11-081-1/+1
| |\ \
| * \ \ Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-183-4/+14
| |\ \ \
generated by cgit v1.1 at 2024-11-15 16:46:31 +0000