Lirusaito fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate ...

Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp

2013-06-11 15:32:18 -04:00

..

apollo

Update keywords.ini in skins to match c5fc945f33 changes

2013-05-31 17:31:18 -04:00

blackdark

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blacklightblue

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blackred

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

dark

…

darkcatalan

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

darkgred

…

darkorange

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

default

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-11 15:32:18 -04:00

emerald

…

frenchtouch

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

gemini

Update keywords.ini in skins to match c5fc945f33 changes

2013-05-31 17:31:18 -04:00

gred

…

italia

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kdarknv

…

kirstenLite2

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kliteat

…

nanogreen

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

nanopurple

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

new_silver

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

openlife

…

orangelife

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

ponyaquablue

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

ponypurple

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

pslgreen

…

pslpurple

…

ruby

…

sapphire

…

secondlove

Added Nomade's SecondLove skin

2012-08-25 16:23:29 -04:00

silver

Add top level build directory to gitignore, and mode change on files that certainly shouldn't be executable.

2013-05-17 03:02:57 -04:00

snowwhite

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

stpatrick

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

white_emerald

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

wisdom

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

Apollo.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

blackdark.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blacklightblue.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blackred.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

dark.xml

…

DarkCatalan.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

DarkOrange.xml

…

DarkRed.xml

…

Default.xml

…

Emerald.xml

…

FrenchTouch.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

Gemini.xml

…

GregsRed.xml

…

Italia.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kDarkNvid.xml

…

KirstenLite2.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kliteat.xml

…

nanogreen.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

nanopurple.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

New_Silver.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

OpenLife.xml

…

OrangeLife.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

paths.xml

…

Pony-Aquablue.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

Pony-Purple.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

pslgreen.xml

…

pslpurple.xml

…

Ruby.xml

…

sapphire.xml

…

SecondLove.xml

Added Nomade's SecondLove skin

2012-08-25 16:23:29 -04:00

Silver.xml

…

SnowWhite.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

StPatrick.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

White.xml

…

wisdom.xml

…