aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'viewerinfo' into nextJacek Antonelli2011-05-251-14/+8
|\
| * Ported viewerinfo.cpp from Kokua.Jacek Antonelli2011-05-191-14/+8
| | | | | | | | | | | | | | | | | | | | It defines the ViewerInfo module/namespace, which contains a variety of functions for querying the viewer name and version. It is designed to be a replacement for viewerversion.cpp and viewerversion.xml. viewerversion.cpp has been removed, but viewerversion.xml remains (albeit with a bogus version number) until the packaging system no longer uses it.
* | Merge remote-tracking branch 'armin/misc' into nextJacek Antonelli2011-05-222-26/+43
|\ \ | |/ |/|
| * show llwarns instead of llinfos when llsd parsing fails and add the reason + ↵Armin Weatherwax2011-05-172-26/+43
| | | | | | | | line
* | Merge branch '1.3-maint' into nextJacek Antonelli2011-05-181-1/+9
|\ \ | |/ |/| | | | | | | | | Conflicts: linden/indra/llcommon/CMakeLists.txt linden/indra/newview/llvoavatar.cpp linden/indra/newview/viewer_manifest.py
| * also link with ld.goldArmin Weatherwax2011-05-171-1/+9
| | | | | | | | thanks to Aleric and Siana for the idea
| * Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.Jacek Antonelli2011-02-221-1/+1
| |
| * SNOW-422: Imprudence doesn't compile with g++ 4.4.x (#562)Aleric Inglewood2010-10-031-1/+1
| |
| * Fixed some missing constants in the script editor and added ↵McCabe Maxsted2010-08-262-0/+18
| | | | | | | | llGetLinkNumberOfSides
| * Applied patch for #424: fix proper detection of Windows 7, backport from ↵McCabe Maxsted2010-08-261-3/+39
| | | | | | | | Snowglobe 2.0 by Ansariel Hiller
* | fix some flaws in the cloud particle prefsArmin Weatherwax2011-04-192-0/+3
| |
* | Remember name and password based on grid. This is far from optimal, but will ↵McCabe Maxsted2011-04-192-0/+36
| | | | | | | | | | | | | | | | | | | | | | work for the time being. * UI needs to be made clear on what's going on with user's passwords * 'Remember password' checkbox now works on login (but is unclear) * Stored passwords are MD5s in grid_info.xml * Fixed vivox license appearing on other grids rather than specifically on second life login when voice is enabled * Small fix for username entry after logout * Sadly, storing password in the mac keychain needs to be reimplemented now
* | Identify Windows Server 2008 and 2008 R2, added Win 8 detection for ↵McCabe Maxsted2011-04-131-17/+41
| | | | | | | | future-proofing. Ported from Phoenix, patch by Tank Master
* | fix bug #853 crash caused by antistringsArmin Weatherwax2011-04-111-1/+2
| |
* | Fixed Mhz -> MHz, ported from Singularity, patch by ShyotlMcCabe Maxsted2011-04-062-9/+9
| |
* | Extended windows detection to include Windows 7, ported from Singularity, ↵McCabe Maxsted2011-04-062-9/+122
| | | | | | | | patch by Shyotl
* | Merge remote-tracking branch 'jacek/exp' into expMcCabe Maxsted2011-03-192-3/+8
|\ \
| * | Fixed bad line endings (CRLF) in many files.Jacek Antonelli2011-03-181-5/+5
| | | | | | | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future.
| * | Fix setting the viewer offset time from OpenRegionSettings, and also have it ↵RevolutionSmythe2011-03-181-3/+3
| | | | | | | | | | | | show what UTC offset it is representing in the time bar.
| * | Merge in Var Sized Regions into the Imprudence Experimental.RevolutionSmythe2011-03-181-1/+6
| | |
* | | Use a buffer for debug console output (improves speed on Windows when ↵McCabe Maxsted2011-03-141-0/+3
|/ / | | | | | | console is enabled). Ported from Singularity, patch by Shyotl
* | use logcontrol.xml also for SLPluginArmin Weatherwax2011-03-011-1/+1
| |
* | Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.Jacek Antonelli2011-02-271-1/+1
| |
* | Merge remote branch 'remotes/github/weekly' into weeklyMcCabe Maxsted2011-02-1820-417/+1261
|\ \
| * | Fixed Windows compile error introduced in fe9a3d2b. Also made sure ↵McCabe Maxsted2010-11-236-1/+13
| | | | | | | | | | | | winsock2.h is always included before windows.h throughout the source to prevent collisions
| * | 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
* | | | Merge branch 'armin/weekly' into weeklyJacek Antonelli2011-02-093-0/+257
|\ \ \ \ | |/ / / |/| | |
| * | | Henri Beauchamp: Display Names support v4Armin Weatherwax2011-01-243-0/+257
| |/ /
* | | 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.
generated by cgit v1.1 at 2024-11-16 07:35:48 +0000