aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-302-139/+340
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same. Conflicts: .gitignore linden/indra/develop.py linden/indra/llcommon/llsdserialize_xml.cpp linden/indra/newview/CMakeLists.txt Manually combined MOAP, OTR, and WL changes from both. linden/indra/newview/app_settings/default_grids.xml Manually merged the grid collection. Also updated IG info. linden/indra/newview/hippoupdate.cpp linden/indra/newview/llettherebelight.cpp Just used the Imprudence copy. linden/indra/newview/llviewermessage.cpp Keep unbranding. linden/indra/newview/llvoavatar.cpp Manually merge client tags. linden/indra/newview/res/viewerRes.rc Manually merge version from Impy. linden/indra/newview/skins/dark/colors_base.xml Keep unbranding. linden/indra/newview/skins/default/html/unabletoconnect.png linden/indra/newview/skins/default/textures/icon_top_pick.tga linden/indra/newview/skins/default/xui/en-us/floater_about.xml Manual merging of contributors. linden/indra/newview/skins/gemini/colors_base.xml Keep unbranding. linden/indra/newview/skins/gemini/textures/icon_top_pick.tga linden/indra/newview/viewer_manifest.py Manually merged boost, gstreamer, OTR, and name. linden/indra/newview/viewerinfo.cpp Manually merge the comment.
| * Resorted the grid list file.David Walter Seikel2013-05-151-15/+15
| |
| * Updated New World Grid details, at their request.David Walter Seikel2013-05-151-8/+8
| |
| * Update the basic graphics detail slider.David Seikel2013-05-134-156/+0
| | | | | | | | | | | | | | | | | | Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them. And looks like they left crap laying around from the old method. Removed the crap. Updated the values the slider uses to better suit modern equipment, while leaving the low end the same. Pumped up "linden" tree rendering, it was way too low.
| * Update grid list to match Kokua, and sort them.David Walter Seikel2013-04-081-156/+242
| |
| * MOAP Radar patch setRobin Cornelius2013-04-051-0/+128
| |
| * Merge the artwork and font "prebuilt" packages into the source repo, as ↵David Walter Seikel2012-03-0144-0/+4852
| | | | | | | | | | | | | | | | discussed on IRC and the mailing list, and remove some SL logos. I know, there are two slightly different LICENSE-logos.txt files. One that was originally in the source repo, one that was from the artwork package. I'm a coder, not a lawyer, and not the owner of those copyrights, so left them as is.
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2012-02-202-12/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: linden/indra/newview/installers/windows/meta-impy_installer_template.iss Branding conflict, fixed. linden/indra/newview/llviewerwindow.cpp Already had this change, but merged the minor difference.
| * Removed google translate since the service is no longer availableMcCabe Maxsted2012-02-181-11/+0
| |
| * Re-commented out Inventory loggingMcCabe Maxsted2012-02-171-1/+1
| |
* | Remove more of the "set your own tag colour" stuff.David Walter Seikel2011-12-031-11/+0
| | | | | | | | I think this is right.
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2011-12-031-22/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious. Conflicts: .gitignore linden/indra/cmake/00-Common.cmake linden/indra/newview/llvoavatar.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerinfo.cpp The usual branding conflicts.
| * Ported external script editor patch from Phoenix, added some cleanup, and ↵McCabe Maxsted2011-09-131-0/+11
| | | | | | | | made it use menus (also added autosave and fixed the 'reset' button alignment being off while I was there)
| * Revert "Reverted ability to customize the Imprudence client tag color."McCabe Maxsted2011-09-081-0/+16
| | | | | | | | This reverts commit 87219855c664447a39dd7c2d8866f0a630d1c843.
| * Backout of the sculptie derender patch ported from FireStormMcCabe Maxsted2011-09-081-22/+0
| | | | | | | | This also reverts 14f4622c and 534767ef
* | Merge remote-tracking branch 'imprudence/1.4-beta1.5' into nextDavid Walter Seikel2011-07-213-12/+144
|\ \ | |/ | | | | | | | | | | Conflicts (merged manually): .gitignore linden/indra/newview/llgesturemgr.cpp linden/indra/newview/viewerinfo.cpp
| * Added debug settings RenderSculptSAThreshold and RenderSculptSAMax. Adjust ↵McCabe Maxsted2011-07-081-0/+22
| | | | | | | | these if sculpties ever go invisible that shouldn't
| * Only check if an object is above SculptSAThresh if it's an actual sculptieMcCabe Maxsted2011-07-081-0/+1
| |
| * Added clear sounds cache optionMcCabe Maxsted2011-07-051-0/+11
| |
| * Added debug setting KeepUnpackedCacheFiles to keep unpacked script, sound, ↵McCabe Maxsted2011-07-051-0/+11
| | | | | | | | and avatar files in the cache between restarts
| * Created new window for selectively clearing different parts of the cache ↵McCabe Maxsted2011-06-302-12/+61
| | | | | | | | from disk
| * Created new window for inworld dice rolling in advanced > UI. Todo: add ↵McCabe Maxsted2011-06-231-0/+38
| | | | | | | | button for 'rocks fall, everybody dies'
* | Add the iGrid developmnet grid.David Walter Seikel2011-06-291-2/+17
| |
* | Update Infinite Grid details.meta-impy-v1.4.0-b1David Walter Seikel2011-06-251-6/+6
| |
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-192-61/+1
|\ \ | |/ | | | | | | | | | | Conflicts (manually merged the grids, ignored the other two): linden/indra/newview/app_settings/default_grids.xml linden/indra/newview/llvoavatar.cpp linden/indra/newview/skins/default/xui/en-us/panel_login.xml
| * Fixed DicDownloadBaseURL to use http://app.kokuaviewer.org.Jacek Antonelli2011-06-161-1/+1
| |
| * Removed Meta7 and WorldSimTerra from default_grids.xml.Jacek Antonelli2011-06-151-31/+1
| | | | | | | | Meta7 is definitely gone, WorldSimTerra seems to be, too.
| * Removed Aurora Grid from the default grid list.Jacek Antonelli2011-06-151-15/+0
| | | | | | | | It's only a testing/development grid, not intended for real use.
| * Reverted ability to customize the Imprudence client tag color.Jacek Antonelli2011-06-141-16/+0
| | | | | | | | | | | | | | | | | | The Imprudence tag color is part of our official branding. Users can turn it off, but the color itself is not a matter of user preference. This reverts commits e7ab172b762bbbb87ca78889fdaecfda39a71233 and c903ce543fecedd53d07f2d0fa7f6b149b2b8a1, and removes two widgets from Preferences > Colors.
| * Merge remote-tracking branch 'thickbrick/misc' into nextJacek Antonelli2011-06-141-1/+1
| |\
| | * Fix #924: default RunMultipleThreads to TRUE.thickbrick2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | This should work around the 5% FPS slowdown caused by #614 and is generally a good idea (unless it causes problems, in which case it's definetely a bad idea).
* | | Merge remote-tracking branch 'jacek/next' into nextDavid Seikel2011-06-123-28/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manualy merged): linden/indra/newview/app_settings/default_grids.xml linden/indra/newview/primbackup.cpp linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/notifications.xml InWorldz specific crap removed.
| * | Updated app_settings/default_grids.xml from our online grid list.Jacek Antonelli2011-06-111-15/+22
| | |
| * | Removed debug setting MaxSelectDistance...McCabe Maxsted2011-06-091-11/+0
| | | | | | | | | | | | | | | | | | | | | ... in favor of setting the select distance differently between opensim and second life in the hippo limits (cherry picked from commit 2545b11e06538010bd5ddb46499920a43889ed0f)
| * | Re-enabled fetchinventoryonlogin setting and renamed it to ↵McCabe Maxsted2011-06-081-2/+2
| | | | | | | | | | | | fetchinventoryonlogin2 so it's enabled for users of previous versions
| * | Always show lldebugs for inventory for now. Logs will be our best debugging ↵McCabe Maxsted2011-06-081-1/+1
| |/ | | | | | | tool for the test build
| * Enable SaveSearchResults by default.Jacek Antonelli2011-06-061-1/+1
| | | | | | | | | | Most users will want this, the only downside is some SLPlugin instances idling in the background.
* | Update the basic graphics detail slider.David Seikel2011-06-094-156/+0
| | | | | | | | | | | | | | | | | | Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them. And looks like they left crap laying around from the old method. Removed the crap. Updated the values the slider uses to better suit modern equipment, while leaving the low end the same. Pumped up "linden" tree rendering, it was way too low.
* | Default Lightshare to being on.David Seikel2011-06-091-1/+1
| |
* | First hack at fixing up http://onefang.net/redmine/issues/41 .David Seikel2011-06-064-10/+10
| | | | | | | | Definately needs more work at a deeper level.
* | Sort grids in alphabetical order. Removed some, added others.David Seikel2011-06-061-131/+116
| | | | | | | | | | | | Removed LL grids, this viewer is not compliant with their policy. Removed OSGrid, they seem bent on banning users for no good reason. Added others that are where meta-impy users are likely to be hanging out.
* | Settings.xml is not really diff friendly. Patch up some, changes others ↵David Seikel2011-06-061-44/+33
| | | | | | | | that I have reconsidered, fix up some actual problems.
* | 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.
generated by cgit v1.1 at 2025-03-30 14:08:44 +0000