aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Oops, fix the beta grid details.David Seikel2011-03-271-2/+2
|
* Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-204-13/+80
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Henri Beauchamps version of Sione Lomus media filter patch.Armin Weatherwax2011-03-132-0/+28
| | | | | | | | | | | | from http://sldev.free.fr/ : "MediaFilter_v3: based on code by Sione Lomu with a couple of bugfixes by Tonya Souther, this improved patch brings media and streaming audio URLs filtering (to prevent IP ripping by so-called security systems which violate the SL TOS by catching your IP and associating your various avatars with it, thus violating your anonimity). Beside empowering your viewer with allow/deny/blacklist/whitelist functions per domain, this improved patch makes the difference between external servers (domains names filtering) and in-world servers (scripted objects with built-in HTTP servers). I also fixed various bugs, security holes and shortcomings, refactored the code and improved it, and added a whitelist/blacklist erasing function." Imprudence changes: added "MediaFilter" debug to be able to inspect the full url and media texture uuid
| * Changed version to Experimental 2011.03.11McCabe Maxsted2011-03-111-1/+1
| |
| * Merge remote-tracking branch 'armin/weekly' into weeklyMcCabe Maxsted2011-03-101-1/+12
| |\
| | * Tazy Scientist: Feature #759 Particle Chat EnhancedArmin Weatherwax2011-03-101-1/+12
| | | | | | | | | | | | | | | script is here: http://redmine.kokuaviewer.org/attachments/164/script.txt I (ArminW) added also a ParticleChatCannel setting to Tazys patch.
| * | Merge remote branch 'armin/weekly' into weeklyMcCabe Maxsted2011-03-042-2/+14
| |\ \ | | |/
| | * Revolution Smythe: load voice module depending on login responseArmin Weatherwax2011-03-011-1/+11
| | |
| | * fix news bar doesn't open internal browserArmin Weatherwax2011-03-011-7/+9
| | |
| * | Updated default_grids.xml to include Aurora-GridMcCabe Maxsted2011-03-041-1/+16
| | |
| * | Recommented out plugin log info in logcontrol.xmlMcCabe Maxsted2011-03-041-8/+9
| |/
* | Default to UTC time.David Seikel2011-03-031-3/+3
| |
* | No need for the default grid selector, this is the meta 7 viewer, the ↵David Seikel2011-03-031-3/+3
| | | | | | | | default grid is meta 7.
* | Merge branch 'branding' into weeklyDavid Seikel2011-03-032-4/+4
|\ \
| * | Branding Meta7 -> meta 7.David Seikel2011-03-022-4/+4
| | |
* | | Revert "Added a "news bar" at the bottom of the login screen."David Seikel2011-03-011-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like something that is better done in the login page for us, and stops people bitching about how insecure this viewer is due to sending stuff to the impy server. They are still sensative after the Emerald fiasco. This reverts commit 373179115193077d258881d54cc1c07edf99c3a5.
* | | Merge branch 'branding' into weekly, with some post merge branding tweeks.David Seikel2011-03-0146-15/+4882
|\ \ \ | |/ /
| * | Unbranding. Todays word is "linden".David Seikel2011-02-251-1/+1
| | |
| * | Merge branch 'weekly' into brandingDavid Seikel2011-02-203-3/+146
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * | | UNBRANDING! Conservativley remove references to "second life", replacing ↵David Seikel2011-02-131-6/+6
| | | | | | | | | | | | | | | | them with something generic.
| * | | Make most of search work.David Seikel2011-02-111-0/+2
| | | |
| * | | Update meta7 login details, and add the beta grid.David Seikel2011-02-091-6/+19
| | | |
| * | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | need to be reverted later. Changed file names to.
| * | | Artwork and font files in the repo now.David Seikel2011-02-0844-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 Seikel2011-01-191-1/+1
| | | |
* | | | Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-03-012-31/+29
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Added a "news bar" at the bottom of the login screen.Jacek Antonelli2011-02-271-0/+11
| | | | | | | | | | | | | | | | | | The web page to load is defined by the setting "NewsBarURL". Default is "http://app.kokuaviewer.org/news/", which will display links to the latest Imprudence/Kokua blog posts, etc.
| * | Improved warning message about SL statistics packet.Jacek Antonelli2011-02-271-1/+1
| | |
| * | Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.Jacek Antonelli2011-02-271-5/+5
| | |
| * | Updated default_grids.xml from current online grids list.Jacek Antonelli2011-02-271-26/+13
| | |
* | | Reduce the logging spam to warnings. Debug was too much.David Seikel2011-02-201-2/+2
| | |
* | | Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-02-203-1/+144
|\ \ \ | |/ / | | / | |/ |/|
| * Patch by Armin to split apart the 'Plugin' logcontrol.xml entry to avoid ↵McCabe Maxsted2011-02-101-1/+9
| | | | | | | | spam when debugging plugins
| * Add an UI for Display name settings to prefs general, make the setting more ↵Armin Weatherwax2011-01-251-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 v4Armin Weatherwax2011-01-241-0/+36
| |
| * re-enable statistics packet for SL, firstuse warn about itArmin Weatherwax2011-01-201-0/+11
| |
| * load unloaded-avatar-cloud particle system from LLSD file.Armin Weatherwax2010-12-221-0/+88
| |
* | Update the grid manager to load grids from our meta7 server. Set the default ↵David Seikel2011-01-181-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 Seikel2011-01-181-0/+11
|/ | | | | | toggled by CTRL+SHIFT+G. By Tom Meta from his fork. See the TomsOldWork branch.
* 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 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-121-0/+11
| | | | (fly) up animation
* Added missing 'Plugin' entry in logcontrol.xmlMcCabe Maxsted2010-11-101-0/+1
|
* fix: add missing AllowEditingOfTrees settingArmin Weatherwax2010-11-091-0/+12
|
* fix: add missing settings for logging into Aurora SimArmin Weatherwax2010-11-091-1/+37
|
* Changed nickname highlight nick settings from 'nick#' to ↵McCabe Maxsted2010-11-051-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 Maxsted2010-11-052-1/+5
| | | | changes to llSensor LSL function
* Fixed missing UseLocalChatWithBubbles control introduced in af6877fb (#685), ↵McCabe Maxsted2010-11-051-0/+11
| | | | patch by Nicky Perian