aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/html (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-301-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge the artwork and font "prebuilt" packages into the source repo, as ↵David Walter Seikel2012-03-013-0/+0
| | | | | | | | | | | | | | | | 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.
* | Pathetic excuse for a new logo. Hopefully a better one comse soon.David Seikel2011-04-292-1/+1
| |
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-18/+36
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Improve the error message for a missing login screenArmin Weatherwax2011-03-011-18/+36
| |
| * fix: imprudence logo not showing in login screen; login screens not loading ↵Armin Weatherwax2011-03-011-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.
* | Add meta7 logo to startup page, AND make it work.David Seikel2011-02-262-0/+9
| |
* | UNBRANDING! Conservativley remove references to "second life", replacing ↵David Seikel2011-02-131-2/+2
| | | | | | | | them with something generic.
* | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-0/+0
| | | | | | | | | | | | need to be reverted later. Changed file names to.
* | Artwork and font files in the repo now.David Seikel2011-02-083-0/+0
|/ | | | | 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.
* Center the "loading..." text on the login page.Aleric Inglewood2010-11-051-9/+0
| | | | | | | The loading.html page is no longer used. Instead embedded html found in panel_login.xml is used. I couldn't get it to show an image, but at least the "loading..." text is now centralized and I changed the background color from black to imprudence-purple.
* Added Imprudence viewer artwork to install.xmlMcCabe Maxsted2009-12-061-0/+0
|
* Rebranded startup loading page to ImprudenceMcCabe Maxsted2009-09-042-1/+1
|
* Converted more files to Unix line endings.Jacek Antonelli2009-05-301-9/+9
| | | | | | | | linden/LICENSE-libraries-win32.txt linden/indra/newview/SecondLife.nib/objects.xib linden/indra/newview/app_settings/cmd_line.xml linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt linden/indra/newview/skins/default/html/en-us/loading/loading.html
* Second Life viewer sources 1.20.13Jacek Antonelli2008-08-159-0/+216
generated by cgit v1.1 at 2025-04-04 21:36:32 +0000