meta-impy - Metaverse (OpenSim/SL) viewer with an emphasis on usability. My attempt to keep up with 1.4 impy development.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'imprudence/next' into next	David Walter Seikel	2013-08-30	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| *	Fixes http://redmine.kokuaviewer.org/issues/585	David Walter Seikel	2012-03-05	1	-1/+1
\| \|
\| *	Merge the artwork and font "prebuilt" packages into the source repo, as ↵	David Walter Seikel	2012-03-01	388	-0/+593
\| \| \| \| \| \| \| \|	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.
*	Unbranding. Todays word is "linden".	David Seikel	2011-02-25	1	-1/+1
\|
*	Artwork and font files in the repo now.	David Seikel	2011-02-08	390	-0/+593
	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.