| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Unbranding. Todays word is "linden". | David Seikel | 2011-02-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'weekly' into branding | David Seikel | 2011-02-20 | 3 | -3/+146 |
| |\ | | | | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp | ||||
| | * | Reduce the logging spam to warnings. Debug was too much. | David Seikel | 2011-02-20 | 1 | -2/+2 |
| | | | |||||
| | * | Merge remote-tracking branch 'mccabe/weekly' into weekly | David Seikel | 2011-02-20 | 3 | -1/+144 |
| | |\ | |||||
| | | * | Patch by Armin to split apart the 'Plugin' logcontrol.xml entry to avoid ↵ | McCabe Maxsted | 2011-02-10 | 1 | -1/+9 |
| | | | | | | | | | | | | | spam when debugging plugins | ||||
| | | * | Add an UI for Display name settings to prefs general, make the setting more ↵ | Armin Weatherwax | 2011-01-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | intuitive instead: of 0 legacy only , 1 both and 2 display names only we use now: 0 legacy, 1 display names only and 2 both | ||||
| | | * | Henri Beauchamp: Display Names support v4 | Armin Weatherwax | 2011-01-24 | 1 | -0/+36 |
| | | | | |||||
| | | * | re-enable statistics packet for SL, firstuse warn about it | Armin Weatherwax | 2011-01-20 | 1 | -0/+11 |
| | | | | |||||
| | | * | load unloaded-avatar-cloud particle system from LLSD file. | Armin Weatherwax | 2010-12-22 | 1 | -0/+88 |
| | | | | |||||
| * | | | UNBRANDING! Conservativley remove references to "second life", replacing ↵ | David Seikel | 2011-02-13 | 1 | -6/+6 |
| | | | | | | | | | | | | | them with something generic. | ||||
| * | | | Make most of search work. | David Seikel | 2011-02-11 | 1 | -0/+2 |
| | | | | |||||
| * | | | Update meta7 login details, and add the beta grid. | David Seikel | 2011-02-09 | 1 | -6/+19 |
| | | | | |||||
| * | | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵ | David Seikel | 2011-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | need to be reverted later. Changed file names to. | ||||
| * | | | Artwork and font files in the repo now. | David Seikel | 2011-02-08 | 44 | -0/+4852 |
| | | | | | | | | | | | | | | | | My policy is to have it all in the repo. None of this downloading pre built stuff from people with no guarantee that they will still have the files a month from now. Been burnt with that before. | ||||
| * | | | Add the Meta7 and white_Meta7 skins, making Meta7 the default skin. | David Seikel | 2011-01-19 | 1 | -1/+1 |
| |/ / | |||||
| * | | Update the grid manager to load grids from our meta7 server. Set the default ↵ | David Seikel | 2011-01-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | grid to meta7. Prevent setting the default grid to anything but meta7 (except by editing the settings file). By Tom Meta from his fork. See the TomsOldWork branch. | ||||
| * | | Set the Grid Manager to not show by default, but make it configurable and ↵ | David Seikel | 2011-01-18 | 1 | -0/+11 |
| |/ | | | | | | toggled by CTRL+SHIFT+G. By Tom Meta from his fork. See the TomsOldWork branch. | ||||
| * | 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 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 | 1 | -0/+11 |
| | | | | | (fly) up animation | ||||
| * | Added missing 'Plugin' entry in logcontrol.xml | McCabe Maxsted | 2010-11-10 | 1 | -0/+1 |
| | | |||||
| * | fix: add missing AllowEditingOfTrees setting | Armin Weatherwax | 2010-11-09 | 1 | -0/+12 |
| | | |||||
| * | fix: add missing settings for logging into Aurora Sim | Armin Weatherwax | 2010-11-09 | 1 | -1/+37 |
| | | |||||
| * | Changed nickname highlight nick settings from 'nick#' to ↵ | McCabe Maxsted | 2010-11-05 | 1 | -3/+3 |
| | | | | | 'HighlightNickname#' to match the rest of settings.xml. Nicknames set before this commit will need to be set again due to the new preferences name | ||||
| * | Applied patch by Ansariel Hiller for #675: Keywords update to reflect ↵ | McCabe Maxsted | 2010-11-05 | 2 | -1/+5 |
| | | | | | changes to llSensor LSL function | ||||
| * | Fixed missing UseLocalChatWithBubbles control introduced in af6877fb (#685), ↵ | McCabe Maxsted | 2010-11-05 | 1 | -0/+11 |
| | | | | | patch by Nicky Perian | ||||
| * | Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵ | McCabe Maxsted | 2010-11-02 | 1 | -12/+89 |
| |\ | | | | | | | browser/media plugin support | ||||
| | * | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-28 | 2 | -1/+23 |
| | |\ | |||||
| | * \ | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-22 | 2 | -12/+61 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | Sync LLViewerMediaImpl::newSourceFromMediaType with SG2 | Aleric Inglewood | 2010-10-19 | 1 | -11/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Also renamed CookiesEnabled to BrowswerCookiesEnabled. Added BrowserJavascriptEnabled, BrowserPluginsEnabled and PluginAttachDebuggerToPlugins. | ||||
| | * | | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵ | Robin Cornelius | 2010-10-10 | 80 | -4822/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 80 | -131/+4867 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | | | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵ | Armin Weatherwax | 2010-09-23 | 80 | -130/+4822 |
| | | | | | | | | | | | | | | | | | | | | | texture system | ||||
| | | * | | | lost in merge: 1 debug setting, some member variables from llpanellandmedia | Armin Weatherwax | 2010-09-23 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | todo: review llpanellandmedia; port flotervoicelicense | ||||
| | | * | | | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -1/+34 |
| | | | | | | |||||
| * | | | | | Load default grid list url from new GridUpdateList setting | McCabe Maxsted | 2010-11-01 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Added missing cloud settings to settings.xml | McCabe Maxsted | 2010-11-01 | 1 | -0/+88 |
| | | | | | | |||||
| * | | | | | Removed duplicate 'BulkChangeIncludeAnimations' in settings.xml. | Jacek Antonelli | 2010-10-26 | 1 | -33/+0 |
| | |_|_|/ |/| | | | |||||
| * | | | | Changed version to Experimental 2010.10.23 | McCabe Maxsted | 2010-10-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added FontSizeMultiplier and FontSizeRounding settings. | Jacek Antonelli | 2010-10-22 | 1 | -0/+22 |
| | |_|/ |/| | | | | | | | | | | | Gives more control over font sizes, addresses font being smaller than some users desire. | ||||
| * | | | Changed version to Experimental 2010.10.17 | McCabe Maxsted | 2010-10-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Disabled inventory loading on login unless FetchInventoryOnLogin is true ↵ | McCabe Maxsted | 2010-10-16 | 1 | -0/+16 |
| | | | | | | | | | | | | | (default to false) | ||||
| * | | | Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett | McCabe Maxsted | 2010-10-09 | 1 | -11/+44 |
| |/ / | |||||
| * | | Changed version to Experimental 2010.10.09 | McCabe Maxsted | 2010-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote branch 'elektra/weekly' into weekly | McCabe Maxsted | 2010-10-08 | 1 | -0/+11 |
| |\ \ | |||||
| | * | | Implemented friends tags highlighting, including preferences->general ↵ | elektrahesse | 2010-10-08 | 1 | -0/+11 |
| | | | | | | | | | | | | | checkbox to enable/disable the feature. The font on the tags is rendered in bold when the option is active. | ||||
| * | | | Merge branch 'weekly-next' into weekly | McCabe Maxsted | 2010-10-08 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Removed persist for HighResSnapshot setting as it causes crash loops when ↵ | McCabe Maxsted | 2010-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | enabled and opening the snapshot window with bad settings | ||||
 |
index : meta-impy | |
| Metaverse (OpenSim/SL) viewer with an emphasis on usability. My attempt to keep up with 1.4 impy development. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |