aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/textures (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.
| * It's April, onefang ate all the Easter eggs. Burp.David Walter Seikel2012-04-297-0/+0
| |
| * Merge the artwork and font "prebuilt" packages into the source repo, as ↵David Walter Seikel2012-03-01530-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.
* | Even I did not notice these icons where missing. lolDavid Walter Seikel2011-12-214-0/+0
| |
* | No need for this thumbnail, the matching skin is gone.David Seikel2011-06-251-0/+0
| |
* | Damn thing is bloated enough without easter eggs.David Seikel2011-06-257-0/+0
| |
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-041-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Replaced the labels in the web browser window with icons based on those in ↵McCabe Maxsted2011-05-271-0/+5
| | | | | | | | the Open Icon Library (http://openiconlibrary.sourceforge.net)
* | Renaming some images to match the "meta7" branding.David Seikel2011-03-032-0/+0
| |
* | Change the skin preferences panel to have the meta skins.David Seikel2011-02-262-0/+0
| |
* | Artwork and font files in the repo now.David Seikel2011-02-08527-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.
* Added missing textures to artwork.Aleric Inglewood2010-10-251-0/+1
| | | | | Also fixed textures.xml by adding media_panel_scrollbg.png which is used in the MediaHUD as one of the media_*.png textures, but was lacking from textures.xml.
* llmediaplugins first stepArmin Weatherwax2010-09-231-1/+19
|
* Katharine Berry: Added understanding of .ww notecards to inventory panel.Armin Weatherwax2010-08-291-1/+1
|
* Katharine Berry: Added an icon for WindLight settings.Armin Weatherwax2010-08-291-0/+4
|
* Updated textures.xml to include the backported alpha/tattoo inventory iconsMcCabe Maxsted2010-06-191-0/+2
|
* Added brandable buy currency button in the status bar (#273). Effectively ↵McCabe Maxsted2010-06-191-2/+0
| | | | reverts ad408085 and 2cb8d8b5
* Added Imprudence viewer artwork to install.xmlMcCabe Maxsted2009-12-066-0/+0
|
* Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-187-1/+3
|\
| * Display selected avatars larger than normal, zoom in at a reasonable speed. ↵McCabe Maxsted2009-09-224-0/+0
| | | | | | | | Included missing artwork
| * Merged 1.2.0-minimap-magnify into 1.2.0-radarzoomMcCabe Maxsted2009-09-221-1/+0
| |\
| | * Applied Aimee's minimap zoom patchMcCabe Maxsted2009-06-091-1/+0
| | |
| * | Added missing left/right arrow texturesMcCabe Maxsted2009-09-132-0/+0
| | |
| * | Added prev/next buttons for windlight presets, cleaned up some stuffMcCabe Maxsted2009-09-131-0/+3
| |/
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-0/+4
|/
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-3/+1
|
* Second Life viewer sources 1.20.14Jacek Antonelli2008-08-151-1/+4
|
* Second Life viewer sources 1.20.13Jacek Antonelli2008-08-151-0/+371