Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | GStreamer010 plugin needs Carbon.h on Mac. | Jacek Antonelli | 2010-11-13 | 1 | -0/+4 | |
| | | | ||||||
* | | | Disable SSE4 on Mac (temporarily). | Jacek Antonelli | 2010-11-13 | 1 | -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 Maxsted | 2010-11-13 | 3 | -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 Maxsted | 2010-11-13 | 1 | -2/+18 | |
| | | | | | | | | object, by Beeks | |||||
* | | Added some status text for the new align tool | McCabe Maxsted | 2010-11-13 | 3 | -1/+6 | |
| | | ||||||
* | | Changed version to Experimental 2010.11.13 | McCabe Maxsted | 2010-11-13 | 1 | -1/+1 | |
| | | ||||||
* | | Updated local copy of default_grids.xml with the latest osgrid ↵ | McCabe Maxsted | 2010-11-13 | 1 | -5/+5 | |
| | | | | | | | | register/password urls and science sim name | |||||
* | | Applied patch by tx Oh for #647: loginuri of osgrid changed | McCabe Maxsted | 2010-11-13 | 1 | -1/+1 | |
| | | ||||||
* | | Added default_grids.xml to cmake | McCabe Maxsted | 2010-11-13 | 1 | -0/+1 | |
| | | ||||||
* | | Added updated French translations for several preferences panels from Eddi ↵ | McCabe Maxsted | 2010-11-13 | 3 | -10/+199 | |
| | | | | | | | | Decosta | |||||
* | | Revert "Reduced the max width and height for the snapshot window to ↵ | McCabe Maxsted | 2010-11-12 | 1 | -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 Maxsted | 2010-11-12 | 1 | -2/+2 | |
| | | ||||||
* | | Added info to DisableInternalFlyUpAnimation to clarify it's local machine only | McCabe Maxsted | 2010-11-12 | 1 | -1/+1 | |
| | | ||||||
* | | Applied patch by Ansariel Hiller for #689: Optionally disable internal hover ↵ | McCabe Maxsted | 2010-11-12 | 2 | -0/+20 | |
| | | | | | | | | (fly) up animation | |||||
* | | Fixed View > Web Browser sometimes loading the external browser and made it ↵ | McCabe Maxsted | 2010-11-12 | 2 | -3/+15 | |
| | | | | | | | | a menu item check rather than a call | |||||
* | | Fixed the align tool label not hiding when switching tabs in the tools window | McCabe Maxsted | 2010-11-12 | 1 | -0/+2 | |
| | | ||||||
* | | Patch by Eryn: fixed the tools window not having enough room to display the ↵ | McCabe Maxsted | 2010-11-12 | 1 | -2/+2 | |
| | | | | | | | | ruler after applying Qarl's align patch | |||||
* | | Applied 8th batch of German translations from Eryn | McCabe Maxsted | 2010-11-12 | 12 | -143/+348 | |
| | | ||||||
* | | Fixed fontconfig library not being set for Linux-only | McCabe Maxsted | 2010-11-12 | 2 | -8/+17 | |
| | | ||||||
* | | Merge remote branch 'nickyp/weekly' into weekly | McCabe Maxsted | 2010-11-12 | 1 | -0/+3 | |
|\ \ | ||||||
| * | | tabs required in contributions.txt | Nicky Perian | 2010-11-12 | 1 | -2/+2 | |
| | | | ||||||
| * | | contributions | Nicky Perian | 2010-11-12 | 1 | -0/+3 | |
| | | | ||||||
* | | | Merge remote branch 'aleric/SNOW-713' into weekly | McCabe Maxsted | 2010-11-12 | 3 | -3/+15 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'weekly' into SNOW-713 | Aleric Inglewood | 2010-11-12 | 7 | -1/+242 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Add support for using ld.gold on linux. | Aleric Inglewood | 2010-11-12 | 3 | -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-713 | Aleric Inglewood | 2010-11-10 | 3 | -2/+16 | |
| |\ \ \ | ||||||
* | \ \ \ | Merge remote branch 'jacek/SNOW-713' into weekly | McCabe Maxsted | 2010-11-12 | 132 | -489/+566 | |
|\ \ \ \ \ | ||||||
| * | | | | | llstring.h directly depends on #include <map>. | Jacek Antonelli | 2010-11-09 | 1 | -0/+1 | |
| |/ / / / | ||||||
| * | | | | IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713 | Aleric Inglewood | 2010-11-09 | 3 | -28/+27 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py Trivial proximity collision. Resolved. | |||||
| * \ \ \ \ | Merge remote branch 'robin/SNOW-713' into SNOW-713 | Aleric Inglewood | 2010-11-07 | 1 | -7/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | As we currently do not build the gstreamer plugin for windows, do not try to ↵ | Robin Cornelius | 2010-11-07 | 1 | -6/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage it in viewer_manifest.py | |||||
| | * | | | | | Correctly stage libhunspell.dll in viewer_manifest.py | Robin Cornelius | 2010-11-07 | 1 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | IMP-692: SNOW-713: Removed isHexString again, since it is not defined anywhere. | Aleric Inglewood | 2010-11-07 | 1 | -2/+0 | |
| |/ / / / / | ||||||
| * | | | | | Use apr_suite-1.3.8 for windows in order to get the dll version of libapr. ↵ | Robin Cornelius | 2010-11-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Required for a DSO libllcommon | |||||
| * | | | | | IMP-692: SNOW-713: Fixed compile bug fixes. | Aleric Inglewood | 2010-11-07 | 8 | -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 plugins | Aleric Inglewood | 2010-11-07 | 126 | -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 weekly | McCabe Maxsted | 2010-11-12 | 1 | -7/+2 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Partial fix #614: wrong calculation of thread run time | thickbrick | 2010-11-13 | 1 | -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 weekly | McCabe Maxsted | 2010-11-11 | 5 | -573/+53 | |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | ||||||
| * | | | | More #700: remove llfloaterhtmlhelp.cpp | thickbrick | 2010-11-10 | 1 | -562/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This file is media plugin a merge leftover. It was renamed to llfloatermediabrowser.cpp, but somehow this got left behind. | |||||
| * | | | | Fix #700: View -> Web Browser does nothing | thickbrick | 2010-11-10 | 3 | -6/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made the "Home" and "Set Home" buttons work. "Send current URL to parcel" is still broken in SL, since it relies on the ParcelNavigateMedia capability which was never implemented by LL. | |||||
| * | | | | Fix #699: Can't drag prims with translate manipulator | thickbrick | 2010-11-10 | 1 | -5/+6 | |
| | | | | | ||||||
| * | | | | Merge branch 'weekly' of https://github.com/AlericInglewood/imprudence into ↵ | thickbrick | 2010-11-09 | 3 | -2/+16 | |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | weekly | |||||
| * | | | | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly | thickbrick | 2010-11-09 | 2 | -8/+5 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly | thickbrick | 2010-11-08 | 19 | -123/+346 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'weekly' of https://github.com/AlericInglewood/imprudence into ↵ | thickbrick | 2010-11-06 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | weekly | |||||
| * \ \ \ \ \ | Merge branch 'weekly' of https://github.com/AlericInglewood/imprudence into ↵ | thickbrick | 2010-11-06 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | weekly | |||||
| * \ \ \ \ \ \ | Merge branch 'weekly' of https://github.com/AlericInglewood/imprudence into ↵ | thickbrick | 2010-11-06 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | weekly | |||||
| * \ \ \ \ \ \ \ | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly | thickbrick | 2010-11-06 | 105 | -467/+681 | |
| |\ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | Added missing 'Plugin' entry in logcontrol.xml | McCabe Maxsted | 2010-11-10 | 1 | -0/+1 | |
| | | | | | | | | | |