Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Added missing textures to artwork. | Aleric Inglewood | 2010-10-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | Also fixed textures.xml by adding media_panel_scrollbg.png which is used in the MediaHUD as one of the media_*.png textures, but was lacking from textures.xml. | |||||
| | * | | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-24 | 1 | -0/+1 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt Renamed RED --> IMP. Merged entries from both. | |||||
| | * \ \ | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-22 | 6 | -13/+96 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | Fix windows mime types and gstreamer plugin name. | Aleric Inglewood | 2010-10-16 | 2 | -485/+7 | |
| | | | | | | ||||||
| | * | | | | RED-595: Manual merge with weekly-webkit. | Aleric Inglewood | 2010-10-15 | 1 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml. | |||||
| | * | | | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵ | Robin Cornelius | 2010-10-10 | 2 | -62/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Viewer 2 texture system" This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d. Conflicts: linden/indra/newview/llsurface.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h | |||||
| | * | | | | Merge branch 'mccabe-plugins' into plugins_merge | Robin Cornelius | 2010-10-10 | 13 | -196/+2283 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | Force mime_types.xml to use gstreamer as default | Robin Cornelius | 2010-10-10 | 2 | -37/+37 | |
| | | | | | | | ||||||
| | | * | | | | fix some mime type issues | Armin Weatherwax | 2010-09-23 | 3 | -39/+132 | |
| | | | | | | | ||||||
| | | * | | | | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵ | Armin Weatherwax | 2010-09-23 | 2 | -12/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture system | |||||
| | | * | | | | Fixed 'there is no media type for text/html' errors | McCabe Maxsted | 2010-09-23 | 1 | -0/+451 | |
| | | | | | | | ||||||
| | | * | | | | Added missing plugins notifications | McCabe Maxsted | 2010-09-23 | 1 | -0/+18 | |
| | | | | | | | ||||||
| | | * | | | | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 10 | -588/+2063 | |
| | | | | | | | ||||||
| * | | | | | | Adds missing .xml files. | RevolutionSmythe | 2010-11-01 | 2 | -0/+46 | |
| | | | | | | | ||||||
| * | | | | | | Fixes a missing help button, adds ability to edit trees like normal objects. ↵ | RevolutionSmythe | 2010-11-01 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds more places to rebuild clouds so that they will not stick in the incorrect place. | |||||
| * | | | | | | Bug fixes for earlier commits. Adds cut to the inventory panel along with ↵ | RevolutionSmythe | 2010-11-01 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | copy and paste. | |||||
| * | | | | | | Merges the Message log and Message builder from Inertia in. | RevolutionSmythe | 2010-11-01 | 1 | -0/+9 | |
| | | | | | | | ||||||
| * | | | | | | Finishes the OpenRegionSettings module, adds a new panel to Region/Estate ↵ | RevolutionSmythe | 2010-11-01 | 19 | -547/+926 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | | | Merge remote branch 'jacek/weekly' into weekly | McCabe Maxsted | 2010-11-01 | 16 | -60/+547 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | New Japanese UI translations from Hiroshi Kumaki. | Jacek Antonelli | 2010-10-25 | 16 | -60/+547 | |
| | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | Cleaned up the ugly Phoenix code for #637 and made it translatable | McCabe Maxsted | 2010-10-25 | 1 | -0/+6 | |
| |/ / / / / | ||||||
| * | | | | | Fixed xml files from the German translation missing from the repo | McCabe Maxsted | 2010-10-23 | 3 | -0/+106 | |
| | | | | | | ||||||
| * | | | | | Added the fifth and sixth batch of German translation updates from Eryn | McCabe Maxsted | 2010-10-23 | 18 | -58/+114 | |
| | | | | | | ||||||
| * | | | | | Updated the Align tool's label with info about Pack | McCabe Maxsted | 2010-10-23 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | Prim alignment tool by Qarl, backported by Jacek. | Jacek Antonelli | 2010-10-23 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qarl has given permission to use this code under the terms of the GPL v2 + FLOSS exception and/or the LGPL v2.1. | |||||
| * | | | | | Merge remote branch 'jacek/weekly' into weekly | McCabe Maxsted | 2010-10-23 | 3 | -11/+21 | |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | Changed several Preferences modal alerts to notifications. | Jacek Antonelli | 2010-10-23 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CacheWillClear, CacheWillBeMoved, ChangeConnectionPort, ChangeSkin, and ChangeFont. There are many other alerts that should be made non-modal in the future, but this should prevent a focus fight with the Vivox policy window. | |||||
| | * | | | | Changed Small font size back to 8.5. | Jacek Antonelli | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this causes blurry fonts for a user, they should enable "Force integer font sizes" in Preferences > Fonts. | |||||
| | * | | | | Added FontSizeMultiplier and FontSizeRounding controls to Font prefs. | Jacek Antonelli | 2010-10-22 | 1 | -0/+10 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | IMP-663: WARNING: replaceSubstitutionStrings: replaceSubstituionStrings ↵ | Aleric Inglewood | 2010-10-23 | 1 | -0/+1 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | FAILURE: value: ignoretext repl: Caused by missing ignoretext in notifications.xml. Also fixed typos in debug output messages. | |||||
| * | | | Changed several spinners in the texture tab from 0.1 incremets to 0.05 for ↵ | McCabe Maxsted | 2010-10-17 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | better accuracy | |||||
| * | | | Ported list link number in tools window from the Ascent Viewer and ↵ | McCabe Maxsted | 2010-10-17 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | Imprudenced it | |||||
| * | | | Added 'Clear History' button to the Teleport History from Phoenix | McCabe Maxsted | 2010-10-16 | 1 | -1/+5 | |
| | | | | ||||||
| * | | | Ported profile button in friendship requests from Phoenix | McCabe Maxsted | 2010-10-16 | 1 | -2/+10 | |
| | | | | ||||||
| * | | | Added missing rlva_strings.xml file | elektrahesse | 2010-10-10 | 1 | -0/+65 | |
| | | | | ||||||
| * | | | Removed spell check from the script editor | McCabe Maxsted | 2010-10-09 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett | McCabe Maxsted | 2010-10-09 | 1 | -4/+4 | |
| |/ / | ||||||
| * | | Tiny layout tweaks to accomodate different font widths. | Jacek Antonelli | 2010-10-08 | 2 | -3/+3 | |
| | | | ||||||
| * | | Use integer font sizes to avoid blurriness on some systems. | Jacek Antonelli | 2010-10-08 | 1 | -5/+5 | |
| | | | ||||||
| * | | Merge remote branch 'elektra/weekly' into weekly | McCabe Maxsted | 2010-10-08 | 1 | -17/+21 | |
| |\ \ | ||||||
| | * | | Implemented friends tags highlighting, including preferences->general ↵ | elektrahesse | 2010-10-08 | 1 | -17/+21 | |
| | | | | | | | | | | | | | | | | checkbox to enable/disable the feature. The font on the tags is rendered in bold when the option is active. | |||||
| * | | | Merge remote branch 'thickbrick/weekly' into weekly | McCabe Maxsted | 2010-10-08 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Fix bug #612: Option to highlight misspeld words doesn't persist between ↵ | thickbrick | 2010-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | sessions. | |||||
| * | | | Reduced the minimum size of the minimap | McCabe Maxsted | 2010-10-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Reduced the max width and height for the snapshot window to hopefully lower ↵ | McCabe Maxsted | 2010-10-03 | 1 | -2/+2 | |
| |/ / | | | | | | | | | | the crash rate a little | |||||
| * | | Applied patch by Ansariel Hiller for #568: reload balance option in the ↵ | McCabe Maxsted | 2010-10-02 | 1 | -0/+5 | |
| | | | | | | | | | | | | advanced menu. Patch originally from Phoenix. I've modified it to support our currency changes, too | |||||
| * | | RED-577: SNOW-477: Wrong string raw_file in strings.xml for RAW file | Aleric Inglewood | 2010-10-02 | 14 | -14/+14 | |
| | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/577 | |||||
| * | | Merge remote branch 'thickbrick/translate_fixes_b' into weekly | McCabe Maxsted | 2010-09-29 | 1 | -3/+6 | |
| |\ \ | ||||||
| | * | | Context translator: default to enabled. | thickbrick | 2010-09-25 | 1 | -3/+6 | |
| | |/ | | | | | | | | | | | | | | | | Set the default of the xui attribute "allow_translate" to true, and add allow_translate="false" to panel_login.xml. This probably needs to be disabled in other places as well. | |||||
| * | | Converted XUI files to unix line endings, again. | Aleric Inglewood | 2010-09-26 | 324 | -20055/+20055 | |
| | | | | | | | | | | | | See http://github.com/imprudence/imprudence/commit/e20f3bb7c3310deca86cfc66af0a086261930bcf |