opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Expand)	Author	Age	Files	Lines
*	More plumbing of the EntityTransferContext (not yet complete)	Melanie Thielker	2015-11-01	2	-2/+4
*	fix merge issues	UbitUmarov	2015-11-01	1	-1/+0
*	Merge branch 'master' into avinationmerge	UbitUmarov	2015-11-01	1	-2/+2
\|\
\| *	Introduce an EntityTransferContext carrying the version numbers to pass	Melanie Thielker	2015-10-31	1	-2/+2
\| *	Testing stage of the new versioning system. Use at own risk. May not	Melanie Thielker	2015-10-31	1	-3/+2
\| *	On to 0.8.3!	Diva Canto	2015-10-18	1	-1/+1
\| *	Clean up of simulation version, the number that rules the compatibility of te...	Diva Canto	2015-10-18	1	-1/+2
* \|	On to 0.8.3!	Diva Canto	2015-10-18	1	-1/+1
* \|	Fixed merge conflicts	Diva Canto	2015-10-18	1	-1/+2
* \|	Merge of ubitworkvarnew with opensim/master as of 20150905.	Robert Adams	2015-09-08	1	-2/+5
\|\ \ \| \|/
\| *	Clean up viewer-based access control specifications.	Diva Canto	2015-09-06	1	-2/+5
* \|	bad merge?	UbitUmarov	2015-09-01	1	-0/+5
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'master' into careminster	Melanie	2013-11-23	2	-7/+14
\| \|\
\| * \	Merge branch 'master' into careminster	Melanie	2013-10-06	1	-1/+1
\| \|\ \
\| * \ \	Merge branch 'master' into careminster	Melanie	2013-09-07	1	-1/+1
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into careminster	Melanie	2013-09-01	1	-4/+8
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-07-24	1	-0/+20
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-07-18	4	-92/+212
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-06-23	1	-6/+6
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-06-13	1	-1/+23
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-04-29	1	-4/+21
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-02-28	4	-4/+8
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-02-23	4	-4/+4
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-02-22	5	-11/+13
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-02-05	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-12-04	1	-10/+25
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-11-17	1	-0/+33
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-11-09	1	-1/+22
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-11-04	1	-0/+9
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-11-03	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-10-20	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster	Melanie	2012-09-27	1	-4/+27
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-09-24	3	-14/+177
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-09-16	1	-4/+57
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-07-01	3	-17/+15
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-04-08	1	-50/+56
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-04-07	2	-105/+193
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-03-31	1	-120/+218
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-03-29	1	-0/+368
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-03-27	3	-4/+25
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-03-27	2	-36/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-03-22	2	-0/+109
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-03-21	2	-0/+311
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-03-09	1	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-02-18	1	-2/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-01-27	1	-6/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-01-12	2	-7/+13
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-01-05	1	-0/+25
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2011-12-22	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into bigmerge	Melanie	2011-12-05	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \