aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/en-us (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-0320-82/+210
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * Merge remote-tracking branch 'thickbrick/exp' into expJacek Antonelli2011-04-017-59/+108
| |\ | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/llpanelaudioprefs.cpp linden/indra/newview/llpanelaudioprefs.h linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
| | * Fix #838: disable hiding of stream urlsthickbrick2011-04-011-37/+7
| | | | | | | | | | | | | | | NoObscuredURL Patch from Henri Beauchamp, applied by hand because of changes between Imprudence and Snowglobe.
| | * Fix 829: Several changes to media filterthickbrick2011-04-012-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds a "less annoying" mode, which attempts to only filter scripted streaming events. On by default (should we change that?) - Adds UI to enable and disable the media filter, both from the filter floater and from the preferences floater. - Adds a button to launch the filter floater to prefences. - Some UI tweaks to the filter floater.
| | * Sync media filter patch to Henri Beauchamp's MediaFilter_v4thickbrick2011-03-282-13/+34
| | | | | | | | | | | | | | | | | | Compared to v3, this adds resolving domains to IPs in order to list them and match them against listed IPs. Also shows both the full stream url and the munged domain that will be added to the lists.
| | * Fix #810: Add video/x-m4v to mime_types_*.xmlthickbrick2011-03-263-2/+35
| | |
| * | Added a new default font size FontSansSerifBigger and fixed FontSansSerifBig ↵McCabe Maxsted2011-03-248-18/+22
| | | | | | | | | | | | not being named FontSansSerifLarge
| * | Moved 'Reset all preferences to default' button to a more logical place: in ↵McCabe Maxsted2011-03-232-5/+5
| | | | | | | | | | | | the main preferences window
| * | Merge remote-tracking branch 'armin/exp' into expMcCabe Maxsted2011-03-223-0/+36
| |\ \
| | * | allow interaction with parcel web mediaArmin Weatherwax2011-03-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * the media face gets focus on click and you can interact with mouse and keyboard with it - just as you would expect it to work in the first place anyway. * added a checkbox in prefs audio & video for what I call "media helper widget" which allows zooming on the face, open the link in a browser window and such - the name of the LL debug setting is a bit misleading ("MediaOnAPrimUI"), since this is not MOAP I avoided that name.
| | * | several embedded browser proxy fixes and one small cookie fixArmin Weatherwax2011-03-212-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * split xmlrpc and web browser proxy setting into 2 settings (because the login service might refuse to let you in using TOR) * fix web proxy to be used not only for the browser floater but also for login screen and parcel media. Backported for that the setProxyConfig method from Viewer-external(last gpl+floss version) * fix: no clear cookies button * todo: cookies need work note to devs of other viewers: if you find this useful feel free to apply my part to "lgpl v2.1 only" code without need to ask (thats all but setProxyConfig, which is anyway also released under lgpl by LL ).
| * | | Support username logins on Linden grids. Seems to cover most edge cases with ↵McCabe Maxsted2011-03-222-1/+40
| | | | | | | | | | | | | | | | our current grid manager, but really exposes the weaknesses of not saving login info with the grid, usability-wise. (Note: autologin and the command line need to be tested)
| * | | Fixed tab order on login screenMcCabe Maxsted2011-03-201-39/+47
| | |/ | |/|
* | | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-206-38/+194
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Added copy text button to Help > About Imprudence and tabbed the info. ↵McCabe Maxsted2011-03-141-54/+79
| |/ | | | | | | Ported from Singularity, patch by Siana Gearz
| * Henri Beauchamps version of Sione Lomus media filter patch.Armin Weatherwax2011-03-133-0/+116
| | | | | | | | | | | | 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
| * Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2011-03-042-0/+15
| |\
| | * Merge remote branch 'origin/weekly' into weeklythickbrick2011-02-035-9/+30
| | |\
| | * | Fix #757: Missing Raycasting tool from Advanced menuthickbrick2011-01-201-0/+6
| | | | | | | | | | | | | | | | | | | | The code to render this tool is in the viewer, but the menu option was dropped when the advanced menu was moved to xml. This adds it back.
| | * | Add menu option for sculpt debugging in Advanced menu.thickbrick2011-01-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new option is Advanced -> Rendering -> Info Displays -> Sculpt. The code for displaying this debug info is old, but the menu option was lost when the Advanced menu was converted to xml.
| | * | Fix #673: IMs & Logging prefs don't persistthickbrick2010-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | Enable per-account settings only after we have an account. Also, make settings that are saved locally not depend on UserInfoReply being received.
| * | | Fixed login menu bar not resizing with the windowMcCabe Maxsted2011-02-271-1/+1
| | | |
* | | | The half arsed IRC support was broken. It's still not working, though it ↵David Seikel2011-03-031-1/+1
| | | | | | | | | | | | | | | | worked the very first time. Damn.
* | | | One half of a crude attempt at providing IRC support.David Seikel2011-03-031-0/+4
| | | |
* | | | Fixes bug http://bugs.meta7.com/view.php?id=103, and related issues about ↵David Seikel2011-03-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | the text shown during group creation. Languages other than English where just guessed at crudely.
* | | | Merge branch 'branding' into weeklyDavid Seikel2011-03-034-19/+20
|\ \ \ \
| * | | | Branding Meta7 -> meta 7.David Seikel2011-03-024-19/+19
| | | | |
* | | | | Revert "Added a "news bar" at the bottom of the login screen."David Seikel2011-03-011-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0113-74/+120
|\ \ \ \ \ | |/ / / /
| * | | | Staff, not employee.David Seikel2011-02-261-1/+1
| | | | |
| * | | | Change the skin preferences panel to have the meta skins.David Seikel2011-02-261-22/+22
| | | | |
| * | | | Adding the meta 7 web site stuff to the help menu. With translations by Ben ↵David Seikel2011-02-261-0/+52
| | | | | | | | | | | | | | | | | | | | and Daniel.
| * | | | Update the About viewer bit for meta-impy.David Seikel2011-02-263-16/+10
| | | | |
| * | | | Unbranding word of the day is "Second Life".David Seikel2011-02-261-1/+1
| | | | |
| * | | | In the meta grid, staff members have the last name "Meta", the users are ↵David Seikel2011-02-251-4/+4
| | | | | | | | | | | | | | | | | | | | "metazens", and we abuse the age verification flag to let people choose to see Adult stuff.
| * | | | Unbranding. Todays word is "linden".David Seikel2011-02-254-20/+18
| | | | |
| * | | | Merge branch 'weekly' into brandingDavid Seikel2011-02-2010-108/+275
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-134-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | them with something generic.
| * | | | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-093-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | need to be reverted later. Changed file names to.
* | | | | Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-03-014-30/+35
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Added a "news bar" at the bottom of the login screen.Jacek Antonelli2011-02-271-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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-14/+12
| | | |
| * | | Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.Jacek Antonelli2011-02-273-8/+8
| | | |
* | | | Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-02-209-82/+268
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'remotes/github/weekly' into weeklyMcCabe Maxsted2011-02-181-1/+2
| |\ \ \
| | * | | IMP-712: Add shortcut for the Groups tab.Aleric Inglewood2010-11-171-1/+2
| | |/ / | | | | | | | | | | | | | | | | Bind control-shift-G to Groups. This is also done in snowglobe.
| * | | Use gstreamer plugin for windows audio mime typesMcCabe Maxsted2011-02-101-11/+11
| | | |
| * | | Update: Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers v6->v9Armin Weatherwax2011-01-292-3/+7
| | | | | | | | | | | | | | | | issue tattoo tinting does not work
| * | | Add an UI for Display name settings to prefs general, make the setting more ↵Armin Weatherwax2011-01-251-61/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-245-6/+137
| | | |
generated by cgit v1.1 at 2025-02-05 19:38:16 +0000