Siana Gearz fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp

2011-12-24 20:12:12 +01:00

..

dark

Remove CR from configuration, source and xml files.

2011-05-01 22:16:05 +02:00

darkgred

…

darkorange

Resolved warning about 8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c not being found. Also renamed it to transparent.j2c because I hate seeing local textures with uuid filenames... and because v2 renamed it too.

2011-10-21 21:46:35 -05:00

default

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2011-12-24 20:12:12 +01: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

Resolved warning about 8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c not being found. Also renamed it to transparent.j2c because I hate seeing local textures with uuid filenames... and because v2 renamed it too.

2011-10-21 21:46:35 -05:00

kliteat

Resolved warning about 8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c not being found. Also renamed it to transparent.j2c because I hate seeing local textures with uuid filenames... and because v2 renamed it too.

2011-10-21 21:46:35 -05:00

openlife

…

Pony-Aquablue

Remove CR from configuration, source and xml files.

2011-05-01 22:16:05 +02:00

Pony-Purple

Skinjob

2010-11-14 14:55:16 +01:00

pslgreen

…

pslpurple

…

ruby

…

sapphire

…

silver

1.5.4 Release

2011-02-20 05:16:22 +01:00

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

Skinjob

2010-11-14 14:55:16 +01:00

Pony-Purple.xml

…

pslgreen.xml

…

pslpurple.xml

…

Ruby.xml

…

sapphire.xml

…

Silver.xml

…

White.xml

…

wisdom.xml

…