aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-043-84/+64
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manually merged): linden/indra/llcommon/llversionviewer.h linden/indra/llvfs/lldir.cpp linden/indra/llvfs/lldir_mac.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/Info-meta-impy.plist linden/indra/newview/llappviewer.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/packaging/mac/Info.plist.in linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerversion.cpp linden/indra/newview/viewerversion.h linden/install.xml Also some post merge tweaks.
| * fix an edge case when voice didn't kick in; fix reconnect to voice not workingArmin Weatherwax2011-06-011-2/+2
| |
| * Merge branch 'viewerinfo' into nextJacek Antonelli2011-05-251-25/+0
| |\
| | * Removed viewerversion.xml, since it's not used anymore.Jacek Antonelli2011-05-251-26/+0
| | |
| | * Ported viewerinfo.cpp from Kokua.Jacek Antonelli2011-05-191-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It defines the ViewerInfo module/namespace, which contains a variety of functions for querying the viewer name and version. It is designed to be a replacement for viewerversion.cpp and viewerversion.xml. viewerversion.cpp has been removed, but viewerversion.xml remains (albeit with a bogus version number) until the packaging system no longer uses it.
| * | Merge remote-tracking branch 'mccabe/1.4.0-fbeta-prefs_reorg' into nextJacek Antonelli2011-05-251-41/+30
| |\ \
| | * | Besides the numerous label and organizational changes, here are the main pointsMcCabe Maxsted2011-05-041-41/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved numerous options out of the Advanced panel * Moved numerous options out of the General panel * Combined the Network and Web Browser panels * Combined IM, Chat, and Spell checking preferences * Combined 'Show timestamps in IMs' and 'Show timestamps in Local Chat' to one ShowTimestamps setting * Removed UI for 'hide my own group title'. This can still be set in the debug settings * Renamed Popups > Notifications * Renamed Chat Colors > Colors * Renamed 'IMs and Logging' to 'Logging and Privacy' * Moved Colors next to Skins * Added style guide to the top of every preferences panel xui
| * | | revamp the voice client.Armin Weatherwax2011-05-222-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * split the "voice" debug tag into several tags for usable filtering while debugging * remove debug-spam from user view by: * remove capability request spam by: * llstartup the voice client state engine when actually a region is present, and not the initial fake region. * don't request a capability to determine if (the very same) capability can be requested. * don't do it over and over as if a capability rezzed in like an avatar. Its available - or not (see llstartup). * unload the daemon if not used. * load vivox daemon depending on specific criteria in the caps * remove the partial implementation to load a specific daemon with via the openregion message or the login response. * discard obsolete caps. Tested and working on linux: Parcel changing, region changing, (SL) voice-disabled region private call, (SL) private call region changing, (OS) no voice <-> voice region changing, (OS) mumble <-> freeswitch region changing. To test: Mac, Win. Anything that needs to be tested and not mentioned above.
| * | | escape special characters in settings.xmlArmin Weatherwax2011-05-171-15/+15
| | |/ | |/|
| * | Bumped version to 1.4.0 beta 1.Jacek Antonelli2011-05-081-3/+3
| | |
| * | Merged Experimental branch (exp) back into main line (next).Jacek Antonelli2011-05-0810-150/+73979
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Git thought many files (almost 100) had merge conflicts. But, after resolving the conflicts (which were mostly trivial), almost all the files turned out to be the same as in the exp branch. So, the conflicts are not listed here. Check the diff between commit 244ffe8 and this commit to see what really changed.
| * | Added a "news bar" at the bottom of the login screen.Jacek Antonelli2011-02-241-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-221-1/+1
| | |
| * | Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.Jacek Antonelli2011-02-221-3/+3
| | |
| * | Updated default_grids.xml from current online grids list.Jacek Antonelli2011-02-221-30/+17
| | |
| * | Applied patch by Ansariel Hiller for #675: Keywords update to reflect ↵McCabe Maxsted2011-02-221-1/+3
| | | | | | | | | | | | | | | | | | changes to llSensor LSL function (Partial cherry-pick of commit d13d991d2d29bd3d0cc9a0d4e5480a0705681d06)
| * | re-enable statistics packet for SL, firstuse warn about itArmin Weatherwax2011-02-221-0/+11
| | | | | | | | | | | | (cherry picked from commit 282cb19508dcd38039454dfe71d23bb042fe376c)
| * | Bumped version to 1.3.1.Jacek Antonelli2010-11-041-1/+1
| | |
| * | Added FontSizeMultiplier and FontSizeRounding settings.Jacek Antonelli2010-10-221-0/+22
| | | | | | | | | | | | | | | Gives more control over font sizes, addresses font being smaller than some users desire.
| * | Removed persist for HighResSnapshot setting as it causes crash loops when ↵McCabe Maxsted2010-10-031-1/+1
| | | | | | | | | | | | enabled and opening the snapshot window with bad settings
| * | Show start location on the login screen by defaultMcCabe Maxsted2010-10-031-1/+1
| | |
| * | Bumped version to 1.3.0.Jacek Antonelli2010-10-011-1/+1
| | |
| * | Fixed #428: showcase tab shows 'all' web search in second lifeMcCabe Maxsted2010-10-011-0/+11
| | |
| * | Changed default UIScaleFactor from 1.002 to 1.0.McCabe Maxsted2010-09-171-1/+1
| | | | | | | | | | | | Revert back if letters start showing crazy leading again
| * | Bumped version to 1.3.0 RC3.Jacek Antonelli2010-09-161-1/+1
| | |
| * | Fixed various instances of 'www.imprudenceviewer.org'. There is no www.Jacek Antonelli2010-09-161-1/+1
| | |
| * | disable speedrez by default, because it confuses less advanced users.Armin Weatherwax2010-09-161-1/+1
| | |
| * | Added debug setting UseLegacyChatLogsFolder for saving chat.txt and IM logs ↵McCabe Maxsted2010-09-161-0/+11
| | | | | | | | | | | | in non-grid-specific folders
| * | Fixed #455: inventory found items vanish after a certain amount of time. ↵McCabe Maxsted2010-09-161-11/+11
| | | | | | | | | | | | Also fixed several inventory search bugs by updating desc. etc. searches to the latest Emerald version
| * | Henri Beauchamp: use http map if possible. Fixes broken map in SL + http map ↵Armin Weatherwax2010-09-161-0/+22
| | | | | | | | | | | | possible for OS
| * | Made DroidSans the new default font.Jacek Antonelli2010-09-101-4/+4
| | |
| * | Added Delicious and DroidSans fonts to package and preferences.Jacek Antonelli2010-09-101-1/+1
| | |
| * | Added Preferences > Fonts tab, with basic font chooser.Jacek Antonelli2010-09-101-0/+11
| | | | | | | | | | | | Choosing a font sets FontChoice setting, but no real effect yet.
| * | Switched main viewer font to DejaVu Sans Condensed.Jacek Antonelli2010-09-101-2/+2
| | |
| * | Updated version to 1.3.0 RC2.Jacek Antonelli2010-08-271-1/+1
| | |
| * | Fixed terminology in VivoxLicenseAccepted help string.Jacek Antonelli2010-08-271-1/+1
| | |
| * | Scratching an ooooold itch: added 'Gestures' slider and mute button to the ↵McCabe Maxsted2010-08-261-0/+22
| | | | | | | | | | | | audio controls
| * | Added vivox license window when enabling voice or starting up for the first ↵McCabe Maxsted2010-08-261-1/+23
| | | | | | | | | | | | time (voice can now be included from here on out :)
| * | Filled app_settings/default_grids.xml with the current online grids list.Jacek Antonelli2010-08-261-5/+218
| | | | | | | | | | | | | | | This will populate the grid list for users who can't update the list from our web site, e.g. because of a firewall or network trouble.
| * | Disable ParticleChat by default, as it's a privacy concern.Jacek Antonelli2010-08-261-1/+1
| | |
| * | Revert increased ToolTipDelay now that the tooltip bug has been (mostly) fixedMcCabe Maxsted2010-08-261-1/+1
| | |
| * | Fixed some missing constants in the script editor and added ↵McCabe Maxsted2010-08-261-2/+3
| | | | | | | | | | | | llGetLinkNumberOfSides
| * | Added missing WL_SUN_MOON_POSITION LightShare constantMcCabe Maxsted2010-08-261-0/+1
| | |
| * | Reverted OpenSim search URLs back to Metaverse Ink.Jacek Antonelli2010-08-261-2/+2
| | | | | | | | | | | | They were unintentionally(?) changed to Avination in 521f7558.
| * | Added menu option for toggling IM auto-responses on/off underneath the Busy ↵McCabe Maxsted2010-08-261-0/+11
| | | | | | | | | | | | option
| * | Updated version to 1.3.0 RC1.Jacek Antonelli2010-08-021-1/+1
| | |
* | | Merge branch 'libotr' into expDavid Seikel2011-05-121-0/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/llmessage/message.cpp linden/indra/newview/llprefsadvanced.cpp
| * | | Apparently there is a wrong client tag for Firestorm out in the wild.David Seikel2011-04-191-0/+12
| | | | | | | | | | | | | | | | Adding both, to be sure, and I've not seen anyone using it anyway.
| * | | Merge branch 'exp' of github.com:onefang/meta-impy into libotrJay Threeth2011-04-053-41/+118
| |\ \ \
| * | | | build fixes, might build on linux nowJay Threeth2011-04-041-0/+16
| | | | |