Aleric Inglewood db17b93156 Merge branch 'master' into meshupload ...

Conflicts:
	indra/newview/llmeshrepository.cpp

Added /* */ around the 'virtual' keyword in two places
that collided with changes in meshupload from lightdrake.

2013-01-13 17:59:49 +01:00

..

en-us

Merge branch 'master' into meshupload

2013-01-13 17:59:49 +01:00

es

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

2013-01-03 02:17:20 +01:00

fr

Client-side maturity handling when teleporting. Adds new notification that asks if you want to change maturity settings with a single click and automatically re-fire the teleport request.

2012-12-25 02:30:51 -06:00