opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge	Melanie	2011-10-25	1	-12/+2
\|\
\| *	Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()	Justin Clark-Casey (justincc)	2011-10-24	1	-12/+2
* \|	Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge	Melanie	2011-10-25	4	-9/+31
\|\ \ \| \|/
\| *	Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS...	Justin Clark-Casey (justincc)	2011-10-24	4	-9/+31
* \|	Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge	Melanie	2011-10-25	1	-8/+14
\|\ \ \| \|/
\| *	separate out future common setup code from EventQueueTests.AddForClient()	Justin Clark-Casey (justincc)	2011-10-24	1	-8/+14
* \|	Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge	Melanie	2011-10-25	3	-2/+75
\|\ \ \| \|/
\| *	Add new EventQueueTests with basic test to check that adding a client registe...	Justin Clark-Casey (justincc)	2011-10-24	3	-2/+75
* \|	Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge	Melanie	2011-10-25	7	-5/+176
\|\ \ \| \|/
\| *	Add optional getauthinfo and setauthinfo authentication service calls.	Justin Clark-Casey (justincc)	2011-10-24	7	-5/+177
* \|	Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge	Melanie	2011-10-25	1	-4/+4
\|\ \ \| \|/
\| *	Comment out the uuid gatherer lines that I accidentally left in.	Justin Clark-Casey (justincc)	2011-10-23	1	-4/+4
* \|	Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge	Melanie	2011-10-25	1	-0/+1
\|\ \ \| \|/
\| *	Fix missing Busy-Mode Response	Pixel Tomsen	2011-10-22	1	-0/+1
* \|	Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge	Melanie	2011-10-25	1	-0/+3
\|\ \ \| \|/
\| *	Add case to Lightshare/Windlight	BlueWall	2011-10-22	1	-0/+3
* \|	Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge	Melanie	2011-10-25	5	-24/+68
\|\ \ \| \|/
\| *	Get UUIDGatherer to scan notecards in the graph for asset uuids.	Justin Clark-Casey (justincc)	2011-10-22	5	-24/+68
* \|	Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge	Melanie	2011-10-25	2	-12/+19
\|\ \ \| \|/
\| *	redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we ...	Justin Clark-Casey (justincc)	2011-10-22	2	-12/+19
* \|	Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge	Melanie	2011-10-25	1	-1/+1
\|\ \ \| \|/
\| *	correct misleading method doc on CreateNotecardAsset()	Justin Clark-Casey (justincc)	2011-10-22	1	-1/+1
* \|	Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge	Melanie	2011-10-25	1	-2/+2
\|\ \ \| \|/
\| *	in AssetHelpers, store the actual text passed in to the method, not the strin...	Justin Clark-Casey (justincc)	2011-10-22	1	-2/+2
* \|	Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge	Melanie	2011-10-25	1	-1/+6
\|\ \ \| \|/
\| *	encode notecard assets in proper format for tests, rather than just using wha...	Justin Clark-Casey (justincc)	2011-10-22	1	-1/+6
* \|	Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge	Melanie	2011-10-25	4	-10/+10
\|\ \ \| \|/
\| *	refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss...	Justin Clark-Casey (justincc)	2011-10-22	4	-10/+10
* \|	Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge	Melanie	2011-10-25	1	-21/+41
\|\ \ \| \|/
\| *	RemoteAdmin - Added optional terrain loading on region create using parameter...	Michelle Argus	2011-10-21	1	-21/+41
* \|	Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge	Melanie	2011-10-25	1	-5/+3
\|\ \ \| \|/
\| *	very minor removal of old commented out line of code in OdeScene	Justin Clark-Casey (justincc)	2011-10-21	1	-5/+3
* \|	Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge	Melanie	2011-10-25	1	-3/+0
\|\ \ \| \|/
\| *	remove unnecessary null check on _collisionEventPrim	Justin Clark-Casey (justincc)	2011-10-20	1	-3/+0
* \|	Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge	Melanie	2011-10-25	3	-25/+32
\|\ \ \| \|/
\| *	Get OdeScene to use passed in time step rather than hard-coded 0.089	Justin Clark-Casey (justincc)	2011-10-20	3	-25/+32
* \|	Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge	Melanie	2011-10-25	1	-12/+4
\|\ \ \| \|/
\| *	Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Ma...	Justin Clark-Casey (justincc)	2011-10-20	1	-12/+4
* \|	Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge	Melanie	2011-10-25	2	-13/+5
\|\ \ \| \|/
\| *	For now, stop passing timeStep into methods where it's not actually used.	Justin Clark-Casey (justincc)	2011-10-20	2	-13/+5
* \|	Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge	Melanie	2011-10-25	1	-2/+2
\|\ \ \| \|/
\| *	Change wording on asset requests.	Justin Clark-Casey (justincc)	2011-10-19	1	-2/+2
* \|	Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge	Melanie	2011-10-25	1	-5/+0
\|\ \ \| \|/
\| *	Removed redundant NotInTransit function from ScenePresence. IsInTransit=false...	Dan Lake	2011-10-19	1	-5/+0
* \|	Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge	Melanie	2011-10-25	5	-318/+318
\|\ \ \| \|/
\| *	Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e...	Dan Lake	2011-10-19	5	-318/+318
\| *	Merge branch 'master' of git://opensimulator.org/git/opensim	Dan Lake	2011-10-19	2	-72/+100
\| \|\
* \| \	Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge	Melanie	2011-10-25	9	-344/+319
\|\ \ \ \| \|/ /
\| * \|	Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ...	Dan Lake	2011-10-19	9	-344/+319
* \| \|	Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge	Melanie	2011-10-25	2	-41/+118
\|\ \ \ \| \| \|/ \| \|/\|