Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-22 | 1 | -3/+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. | ||||
| * | Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett | McCabe Maxsted | 2010-10-09 | 1 | -3/+9 |
| | | |||||
* | | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -1/+1 |
|/ | |||||
* | added spellcheck + translation from Emerald Viewer. references to ↵ | Patrick Sapinski | 2010-08-30 | 1 | -0/+1 |
| | | | | modularsystems.sl should be changed! | ||||
* | Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e | McCabe Maxsted | 2010-08-19 | 1 | -1/+1 |
| | |||||
* | Fixed extra space between timw and AM/PM in timestamps | McCabe Maxsted | 2010-08-02 | 1 | -1/+1 |
| | |||||
* | Added option in Preferences > General for setting the default time to 12 ↵ | McCabe Maxsted | 2010-07-30 | 1 | -2/+12 |
| | | | | hour/24 hour/UTC. Side effects: moved crash logger settings to advanced prefs, fixed french date translations, past/future dates and times still need to be correctly formatted | ||||
* | Applied SNOW-629 Fix: Leading zero missing from hour portion of timestamp ↵ | McCabe Maxsted | 2010-07-15 | 1 | -1/+1 |
| | | | | field in local chat history and log file. Patch by Ardy Lay | ||||
* | VWR-15310 Save to XML doesn't set proper XML tags | Mm Alder | 2010-01-03 | 1 | -0/+10 |
| | |||||
* | Merged almost-final version of Imprudence 1.2 into 1.3 | McCabe Maxsted | 2009-11-08 | 1 | -0/+7 |
|\ | |||||
| * | Applied RLVa-1.0.5e_20091107_Imprudence-1.2.0-diff.patch | McCabe Maxsted | 2009-11-07 | 1 | -0/+7 |
| | | |||||
* | | Merged working branch of 1.2 into LL 1.23 merge | McCabe Maxsted | 2009-10-18 | 1 | -47/+39 |
|\ \ | |/ | |||||
| * | Applied RLVa-1.0.4e_20091010_SL-1.22.11-diff.patch | McCabe Maxsted | 2009-10-16 | 1 | -1/+1 |
| | | |||||
| * | Merge remote branch 'mccabe/1.2.0-next' into next | Jacek Antonelli | 2009-09-09 | 1 | -47/+32 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Moved "Backup" pie menu item to fit "Go Here" in top-left slot. Conflicts: linden/indra/newview/llviewermenu.cpp linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | ||||
| | * | Linux middle mouse button paste/primary selection support and gtk clipboard ↵ | Armin Weatherwax | 2009-09-04 | 1 | -47/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handler (fixes crashbug using synergy mouse-keyboard-clipboard-sharing over lan) modified: linden/doc/contributions.txt modified: linden/indra/llui/llclipboard.cpp modified: linden/indra/llui/llclipboard.h modified: linden/indra/llui/llfloater.cpp modified: linden/indra/llui/llfloater.h modified: linden/indra/llui/lllineeditor.cpp modified: linden/indra/llui/lllineeditor.h modified: linden/indra/llui/lltexteditor.cpp modified: linden/indra/llui/lltexteditor.h modified: linden/indra/llui/llview.cpp modified: linden/indra/llui/llview.h modified: linden/indra/llwindow/CMakeLists.txt new file: linden/indra/llwindow/llmousehandler.cpp modified: linden/indra/llwindow/llmousehandler.h modified: linden/indra/llwindow/llwindow.cpp modified: linden/indra/llwindow/llwindow.h modified: linden/indra/llwindow/llwindowsdl.cpp modified: linden/indra/llwindow/llwindowsdl.h modified: linden/indra/newview/lltool.cpp modified: linden/indra/newview/lltool.h modified: linden/indra/newview/llviewertexteditor.cpp modified: linden/indra/newview/llviewertexteditor.h modified: linden/indra/newview/llviewerwindow.cpp modified: linden/indra/newview/llviewerwindow.h (cherry picked from commit 594f4830922f4294dda432fa748935adffaeed8f) | ||||
| * | | Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch. | Jacek Antonelli | 2009-09-04 | 1 | -0/+7 |
| |/ | | | | | | | Made a few non-functional changes to help it apply. | ||||
* | | Second Life viewer sources 1.23.2-RC | Jacek Antonelli | 2009-05-24 | 1 | -23/+39 |
| | | |||||
* | | Second Life viewer sources 1.23.0-RC | Jacek Antonelli | 2009-04-30 | 1 | -35/+29 |
|/ | |||||
* | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.22.4-RC | Jacek Antonelli | 2009-01-11 | 1 | -1/+4 |
| | |||||
* | Second Life viewer sources 1.22.0-RC | Jacek Antonelli | 2008-12-01 | 1 | -2/+1 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 1 | -24/+24 |
| | |||||
* | Second Life viewer sources 1.20.7 | Jacek Antonelli | 2008-08-15 | 1 | -7/+7 |
| | |||||
* | Second Life viewer sources 1.20.2 | Jacek Antonelli | 2008-08-15 | 1 | -90/+88 |
| | |||||
* | Second Life viewer sources 1.19.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -112/+134 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -50/+46 |
| | |||||
* | Second Life viewer sources 1.18.6.4-RC | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.18.6.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -2/+5 |
| | |||||
* | Second Life viewer sources 1.18.5.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -0/+51 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -0/+3 |
| | |||||
* | Second Life viewer sources 1.18.3.2-RC | Jacek Antonelli | 2008-08-15 | 1 | -15/+76 |
| | |||||
* | Second Life viewer sources 1.18.1.2 | Jacek Antonelli | 2008-08-15 | 1 | -3/+14 |
| | |||||
* | Second Life viewer sources 1.17.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -1/+2 |
| | |||||
* | Second Life viewer sources 1.17.0.12 | Jacek Antonelli | 2008-08-15 | 1 | -76/+16 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 1 | -10/+22 |
| | |||||
* | Second Life viewer sources 1.14.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -2/+18 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 1 | -0/+1490 |