aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Just a temporary hack, to make sure make -j does not get a ridiculously ↵David Seikel2011-01-181-1/+1
| | | | large number. Only affects linux builders. I'll fix it properly later, after I learn python.
* Linux build scripts.David Seikel2011-01-136-0/+536
| | | | | | | | | These are the scripts I use to build most of the viewers that I have tried building. These scripts are based on cmake-SL v1.31 (c)2008-2009 Henri Beauchamp. Released under GPL license v2: http://www.gnu.org/licenses/gpl.txt I split them up and made them more generic.
* Simplified install of libllcommon in Mac manifest.Jacek Antonelli2010-11-141-45/+21
|
* Use proper install_name for Mac libllcommon.Jacek Antonelli2010-11-141-0/+9
|
* Mac SLPlugin.app needs symlinks to some libs.Jacek Antonelli2010-11-141-11/+22
|
* Fixed path to Mac SLPlugin launcher.Jacek Antonelli2010-11-142-2/+2
|
* Commented out gstreamer libs from Mac manifest.Jacek Antonelli2010-11-141-92/+92
|
* Disable packaging of mac-updater.app.Jacek Antonelli2010-11-141-12/+12
|
* Roll back llqtwebkit package to 20100617 on Mac.Jacek Antonelli2010-11-141-2/+2
| | | | | | | | Bandaid for this compile error when linking media_plugin_webkit.dylib: Undefined symbols: "LLEmbeddedBrowserWindowObserver::onRequestFilePicker(LLEmbeddedBrowserWindowEvent const&)", referenced from: vtable for MediaPluginWebKitin media_plugin_webkit.o
* Ported some LLWindowMacOSX changes from Snowglobe 2.Jacek Antonelli2010-11-144-17/+93
| | | | Fixes missing definition for LLWindowMacOSX::getNativeKeyData().
* Use Quicktime plugin on Mac, not GStreamer.Jacek Antonelli2010-11-131-4/+4
|
* GStreamer010 plugin needs Carbon.h on Mac.Jacek Antonelli2010-11-131-0/+4
|
* Disable SSE4 on Mac (temporarily).Jacek Antonelli2010-11-131-2/+2
| | | | GCC 4.0 on Mac OS X 10.5 can't handle SSE4, GCC 4.2 fails.
* Ported keyboard shortcut for align tool from Ascent, by Beeks. Has the ↵McCabe Maxsted2010-11-133-5/+22
| | | | | | | | followingrepercussions: * CTRL-A while a prim is selected switches to the align tool * CTRL-SHIFT-A while a prim is selected switches to the pack tool * Area Object Search shortcut has been changed from CTRL-SHIFT-A to ALT-A
* Ported fix from Ascent: disable align tool controls if you can't move the ↵McCabe Maxsted2010-11-131-2/+18
| | | | object, by Beeks
* Added some status text for the new align toolMcCabe Maxsted2010-11-133-1/+6
|
* Changed version to Experimental 2010.11.13McCabe Maxsted2010-11-131-1/+1
|
* Updated local copy of default_grids.xml with the latest osgrid ↵McCabe Maxsted2010-11-131-5/+5
| | | | register/password urls and science sim name
* Applied patch by tx Oh for #647: loginuri of osgrid changedMcCabe Maxsted2010-11-131-1/+1
|
* Added default_grids.xml to cmakeMcCabe Maxsted2010-11-131-0/+1
|
* Added updated French translations for several preferences panels from Eddi ↵McCabe Maxsted2010-11-133-10/+199
| | | | Decosta
* Revert "Reduced the max width and height for the snapshot window to ↵McCabe Maxsted2010-11-121-2/+2
| | | | | | hopefully lower the crash rate a little" as it's a poor fix, and many photographers find the higher sizes useful This reverts commit 2819c9ae3652e913ea2d2da1c1ed8ef0d2175e00.
* Fixed command line window missing a name for translation (patch by Eryn)McCabe Maxsted2010-11-121-2/+2
|
* Added info to DisableInternalFlyUpAnimation to clarify it's local machine onlyMcCabe Maxsted2010-11-121-1/+1
|
* Applied patch by Ansariel Hiller for #689: Optionally disable internal hover ↵McCabe Maxsted2010-11-122-0/+20
| | | | (fly) up animation
* Fixed View > Web Browser sometimes loading the external browser and made it ↵McCabe Maxsted2010-11-122-3/+15
| | | | a menu item check rather than a call
* Fixed the align tool label not hiding when switching tabs in the tools windowMcCabe Maxsted2010-11-121-0/+2
|
* Patch by Eryn: fixed the tools window not having enough room to display the ↵McCabe Maxsted2010-11-121-2/+2
| | | | ruler after applying Qarl's align patch
* Applied 8th batch of German translations from ErynMcCabe Maxsted2010-11-1212-143/+348
|
* Fixed fontconfig library not being set for Linux-onlyMcCabe Maxsted2010-11-122-8/+17
|
* Merge remote branch 'nickyp/weekly' into weeklyMcCabe Maxsted2010-11-121-0/+3
|\
| * tabs required in contributions.txtNicky Perian2010-11-121-2/+2
| |
| * contributionsNicky Perian2010-11-121-0/+3
| |
* | Merge remote branch 'aleric/SNOW-713' into weeklyMcCabe Maxsted2010-11-123-3/+15
|\ \
| * \ Merge branch 'weekly' into SNOW-713Aleric Inglewood2010-11-127-1/+242
| |\ \ | | |/
| * | Add support for using ld.gold on linux.Aleric Inglewood2010-11-123-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use ld.gold configure with: -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold". ld.gold links the viewer on my machine in 8 seconds, as opposed to 19 seconds with ld.bfd. Moreover, it uses a LOT less memory during linking (about 750 MB instead of 2.5 GB!). Thanks to Siana Gearz for pointing out that ld.gold is so much faster.
| * | Merge branch 'weekly' into SNOW-713Aleric Inglewood2010-11-103-2/+16
| |\ \
* | \ \ Merge remote branch 'jacek/SNOW-713' into weeklyMcCabe Maxsted2010-11-12132-489/+566
|\ \ \ \
| * | | | llstring.h directly depends on #include <map>.Jacek Antonelli2010-11-091-0/+1
| |/ / /
| * | | IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713Aleric Inglewood2010-11-093-28/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py Trivial proximity collision. Resolved.
| * \ \ \ Merge remote branch 'robin/SNOW-713' into SNOW-713Aleric Inglewood2010-11-071-7/+4
| |\ \ \ \
| | * | | | As we currently do not build the gstreamer plugin for windows, do not try to ↵Robin Cornelius2010-11-071-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | stage it in viewer_manifest.py
| | * | | | Correctly stage libhunspell.dll in viewer_manifest.pyRobin Cornelius2010-11-071-1/+3
| | | | | |
| * | | | | IMP-692: SNOW-713: Removed isHexString again, since it is not defined anywhere.Aleric Inglewood2010-11-071-2/+0
| |/ / / /
| * | | | Use apr_suite-1.3.8 for windows in order to get the dll version of libapr. ↵Robin Cornelius2010-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | Required for a DSO libllcommon
| * | | | IMP-692: SNOW-713: Fixed compile bug fixes.Aleric Inglewood2010-11-078-17/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07126-473/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-11-121-7/+2
|\ \ \ \ \
| * | | | | Partial fix #614: wrong calculation of thread run timethickbrick2010-11-131-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gFrameIntervalSeconds instead of gFrameTimeSeconds - which is what the original author tried to do. Also, clean up some dead code. *However*, there is still the issue of texture fetch workers staying alive after finishing partial fetches, which falsly manifests here as pending work.
* | | | | | Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-11-115-573/+53
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |