aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpaneldisplay.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-041-34/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Besides the numerous label and organizational changes, here are the main pointsMcCabe Maxsted2011-05-041-34/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Unbranding. Todays word is "linden".David Seikel2011-02-251-1/+1
|/
* Set can_edit_text attribute to true for draw distance, particle count, and ↵McCabe Maxsted2010-11-051-29/+0
| | | | imposter count. Also increased the draw distance range to 1024 from 512 and changed the increments from 8 to 4 as better defaults
* Applied RLVa-1.1.2-Imprudence.patch by Kitty BarnettMcCabe Maxsted2010-10-091-0/+4
|
* Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)McCabe Maxsted2010-09-251-4/+7
|
* Added slider to control the number of avatar imposters (can't think of a ↵McCabe Maxsted2010-09-061-1/+28
| | | | better label)
* Fixed #197: Windlight toolbar can't be hidden.Jacek Antonelli2010-02-181-2/+2
|
* Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-181-2/+19
|\
| * Merged in jacek/nextMcCabe Maxsted2009-09-141-2/+12
| |
| * Created new toolbar control for windlight presets and optionsMcCabe Maxsted2009-09-101-0/+7
| |
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-10/+4
|/
* Second Life viewer sources 1.22.6-RCJacek Antonelli2009-01-281-1/+9
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-62/+4
|
* Second Life viewer sources 1.21.3-RCJacek Antonelli2008-09-281-3/+3
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-11/+12
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-151-1/+76
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-127/+64
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-275/+575
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-2/+2
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-3/+6
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-151-3/+7
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.18.0.6Jacek Antonelli2008-08-151-1/+0
|
* Second Life viewer sources 1.17.3.0Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-151-3/+11
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-17/+27
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-151-38/+13
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+716