Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mccabe/exp' into weekly | David Seikel | 2011-03-20 | 9 | -58/+232 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge remote-tracking branch 'armin/exp' into exp | McCabe Maxsted | 2011-03-19 | 2 | -2/+2 |
| |\ | |||||
| | * | fix currency in the german status bar button missing | Armin Weatherwax | 2011-03-18 | 1 | -1/+1 |
| | | | |||||
| | * | Fix Bug #799 german floater_pay_object.xml broken | Armin Weatherwax | 2011-03-18 | 1 | -1/+1 |
| | | | |||||
| * | | Added copy text button to Help > About Imprudence and tabbed the info. ↵ | McCabe Maxsted | 2011-03-14 | 1 | -54/+79 |
| |/ | | | | | | | Ported from Singularity, patch by Siana Gearz | ||||
| * | Henri Beauchamps version of Sione Lomus media filter patch. | Armin Weatherwax | 2011-03-13 | 3 | -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 'armin/weekly' into weekly | McCabe Maxsted | 2011-03-04 | 2 | -18/+45 |
| |\ | |||||
| | * | Improve the error message for a missing login screen | Armin Weatherwax | 2011-03-01 | 1 | -18/+36 |
| | | | |||||
| | * | fix: imprudence logo not showing in login screen; login screens not loading ↵ | Armin Weatherwax | 2011-03-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | anymore after navigating to a broken one. This also shows an error page if the login screen page is broken. Todo: replace the trademarked logo. | ||||
| * | | Merge remote branch 'thickbrick/weekly' into weekly | McCabe Maxsted | 2011-03-04 | 2 | -0/+15 |
| |\ \ | |||||
| | * \ | Merge remote branch 'origin/weekly' into weekly | thickbrick | 2011-02-03 | 20 | -162/+577 |
| | |\ \ | |||||
| | * | | | Fix #757: Missing Raycasting tool from Advanced menu | thickbrick | 2011-01-20 | 1 | -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. | thickbrick | 2011-01-20 | 1 | -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 persist | thickbrick | 2010-11-30 | 1 | -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 window | McCabe Maxsted | 2011-02-27 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | The half arsed IRC support was broken. It's still not working, though it ↵ | David Seikel | 2011-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | worked the very first time. Damn. | ||||
* | | | | One half of a crude attempt at providing IRC support. | David Seikel | 2011-03-03 | 1 | -0/+4 |
| | | | | |||||
* | | | | Fixes bug http://bugs.meta7.com/view.php?id=103, and related issues about ↵ | David Seikel | 2011-03-03 | 15 | -43/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | the text shown during group creation. Languages other than English where just guessed at crudely. | ||||
* | | | | Merge branch 'branding' into weekly | David Seikel | 2011-03-03 | 826 | -61/+62 |
|\ \ \ \ | |||||
| * | | | | Renaming some images to match the "meta7" branding. | David Seikel | 2011-03-03 | 18 | -0/+0 |
| | | | | | |||||
| * | | | | Branding Meta7 -> meta 7. | David Seikel | 2011-03-02 | 824 | -61/+61 |
| | | | | | |||||
* | | | | | Revert "Added a "news bar" at the bottom of the login screen." | David Seikel | 2011-03-01 | 1 | -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 Seikel | 2011-03-01 | 2373 | -113/+2739 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Staff, not employee. | David Seikel | 2011-02-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Change the skin preferences panel to have the meta skins. | David Seikel | 2011-02-26 | 3 | -22/+22 |
| | | | | | |||||
| * | | | | Add the PSL purple skin. | David Seikel | 2011-02-26 | 189 | -0/+596 |
| | | | | | |||||
| * | | | | Adding the meta 7 web site stuff to the help menu. With translations by Ben ↵ | David Seikel | 2011-02-26 | 15 | -13/+247 |
| | | | | | | | | | | | | | | | | | | | | and Daniel. | ||||
| * | | | | Update the About viewer bit for meta-impy. | David Seikel | 2011-02-26 | 4 | -17/+11 |
| | | | | | |||||
| * | | | | Add meta7 logo to startup page, AND make it work. | David Seikel | 2011-02-26 | 2 | -0/+9 |
| | | | | | |||||
| * | | | | Unbranding word of the day is "Second Life". | David Seikel | 2011-02-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | In the meta grid, staff members have the last name "Meta", the users are ↵ | David Seikel | 2011-02-25 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | "metazens", and we abuse the age verification flag to let people choose to see Adult stuff. | ||||
| * | | | | Unbranding. Todays word is "linden". | David Seikel | 2011-02-25 | 21 | -44/+42 |
| | | | | | |||||
| * | | | | Merge branch 'weekly' into branding | David Seikel | 2011-02-20 | 22 | -317/+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 Seikel | 2011-02-13 | 6 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | them with something generic. | ||||
| * | | | | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵ | David Seikel | 2011-02-09 | 4 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to be reverted later. Changed file names to. | ||||
| * | | | | | Artwork and font files in the repo now. | David Seikel | 2011-02-08 | 1858 | -0/+1557 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Seikel | 2011-01-19 | 280 | -0/+236 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge remote-tracking branch 'mccabe/weekly' into weekly | David Seikel | 2011-03-01 | 4 | -30/+35 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Added a "news bar" at the bottom of the login screen. | Jacek Antonelli | 2011-02-27 | 1 | -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 Antonelli | 2011-02-27 | 1 | -14/+12 |
| | | | | |||||
| * | | | Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs. | Jacek Antonelli | 2011-02-27 | 3 | -8/+8 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'mccabe/weekly' into weekly | David Seikel | 2011-02-20 | 9 | -82/+268 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote branch 'remotes/github/weekly' into weekly | McCabe Maxsted | 2011-02-18 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | IMP-712: Add shortcut for the Groups tab. | Aleric Inglewood | 2010-11-17 | 1 | -1/+2 |
| | |/ / | | | | | | | | | | | | | | | | | Bind control-shift-G to Groups. This is also done in snowglobe. | ||||
| * | | | Use gstreamer plugin for windows audio mime types | McCabe Maxsted | 2011-02-10 | 1 | -11/+11 |
| | | | | |||||
| * | | | Update: Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers v6->v9 | Armin Weatherwax | 2011-01-29 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | issue tattoo tinting does not work | ||||
| * | | | Add an UI for Display name settings to prefs general, make the setting more ↵ | Armin Weatherwax | 2011-01-25 | 1 | -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 v4 | Armin Weatherwax | 2011-01-24 | 5 | -6/+137 |
| | | | | |||||
| * | | | re-enable statistics packet for SL, firstuse warn about it | Armin Weatherwax | 2011-01-20 | 1 | -0/+18 |
| | | | | |||||
| * | | | load unloaded-avatar-cloud particle system from LLSD file. | Armin Weatherwax | 2010-12-22 | 1 | -0/+7 |
| |/ / |