Shyotl b0ccec2b62 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git ...

Conflicts:
	indra/newview/llvoavatar.cpp

2012-02-01 03:10:46 -06:00

..

html

Now we're Vivox license compliant

2011-01-07 17:07:00 +01:00

textures

Precache a few more inventory icons.

2012-01-30 03:28:35 -06:00

xui

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git

2012-02-01 03:10:46 -06:00

colors_base.xml

Less hardcoded element manipluation for media ticker(allows more freedom for skins, etc). Added gridlines to visualizer. Added oscillator color to color tables (This process sucks, btw).

2012-01-04 03:55:53 -06:00

colors.xml

…