Shyotl 36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing ...

Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp

2011-09-09 16:53:12 -05:00

..

dark

…

darkgred

…

darkorange

…

default

Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing

2011-09-09 16:53:12 -05:00

emerald

…

gemini

two_sided_delimiter workaround (Broken comment blocks in LSL '/*comment*/') Didn't want to mess with the token class for one single case. This fix is pretty straight-forward and self-contained.

2011-06-25 00:28:28 -05:00

gred

…

kdarknv

…

kliteat

…

openlife

…

Pony-Aquablue

…

Pony-Purple

…

pslgreen

…

pslpurple

…

ruby

…

sapphire

…

silver

…

white_emerald

…

wisdom

…

dark.xml

…

DarkOrange.xml

…

DarkRed.xml

…

Default.xml

…

Emerald.xml

…

Gemini.xml

…

GregsRed.xml

…

kDarkNvid.xml

…

kliteat.xml

…

OpenLife.xml

…

paths.xml

…

Pony-Aquablue.xml

…

Pony-Purple.xml

…

pslgreen.xml

…

pslpurple.xml

…

Ruby.xml

…

sapphire.xml

…

Silver.xml

…

White.xml

…

wisdom.xml

…