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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster-presence-refactor	Melanie	2011-04-17	1	-0/+56
\|\
\| *	Mantis #5442: Add admin_save_heightmap	Melanie	2011-04-17	1	-0/+56
\| \|
* \|	Merge branch 'careminster-presence-refactor' of ↵	Melanie	2011-04-17	74	-1079/+1426
\|\ \ \| \| \| \| \| \| \| \| \|	ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
\| * \	Merge branch 'master' into careminster-presence-refactor	Melanie	2011-04-17	74	-1079/+1426
\| \|\ \ \| \| \|/
\| \| *	More descriptive debug msg for ServiceOSDRequest failures.	Dan Lake	2011-04-16	1	-2/+2
\| \| \|
\| \| *	Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more ↵	Diva Canto	2011-04-15	2	-25/+12
\| \| \| \| \| \| \| \| \| \| \| \|	testing to make sure HG inventory isn't broken by this (it shouldn't).
\| \| *	Make remote admin error messages more helpful on windows.	Justin Clark-Casey (justincc)	2011-04-15	1	-88/+73
\| \| \| \| \| \| \| \| \| \| \| \|	Also, make log messages conform more with convention.
\| \| *	refactor: separate out code that adds permissions	Justin Clark-Casey (justincc)	2011-04-15	1	-42/+59
\| \| \|
\| \| *	Merge branch 'master' of /home/opensim/lib/develop/BlueWall	BlueWall	2011-04-15	1	-1/+34
\| \| \|\
\| \| \| *	Thanks Snoopy for a patch that allows setting of perms on items given to new ↵	BlueWall	2011-04-15	1	-1/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	avatars
\| \| \| *	Add ColladaMesh switch	BlueWall	2011-04-13	3	-4/+26
\| \| \| \|
\| \| \| *	Merge branch 'master' of /home/git/repo/OpenSim	BlueWall	2011-04-13	154	-7522/+3275
\| \| \| \|\
\| \| \| * \	Merge branch 'master' of /home/opensim/src/OpenSim/Core	BlueWall	2011-03-21	97	-1508/+2109
\| \| \| \|\ \
\| \| \| * \ \	Merge branch 'master' of /home/opensim/src/OpenSim/Core	BlueWall	2011-02-14	2	-14/+8
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Set filter to send proper rotations for root part	BlueWall	2011-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the root prim, alone or in a set, to send it's rotation. This fixes unsitting the avatar on sit-offsest type teleports where the sit target is in the root prim of a linkset.
\| \| \| * \| \| \|	Revert "Fix unsitting of avatar on linked sets"	BlueWall	2011-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b492f1ce99d27bcf29eb5805564c8778aa4df748.
\| \| \| * \| \| \|	Fix unsitting of avatar on linked sets	BlueWall	2011-02-12	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'master' of /home/opensim/src/OpenSim/Core	BlueWall	2011-02-12	59	-2164/+1164
\| \| \| \|\ \ \ \
\| \| \| * \ \ \ \	Merge branch 'master' of /home/opensim/src/OpenSim/Core	BlueWall	2011-02-09	31	-163/+1037
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	Merge branch 'master' of /home/opensim/src/OpenSim/Core	BlueWall	2011-01-27	60	-699/+898
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Make FireAndForgetWrapper a singleton class	BlueWall	2011-01-13	3	-5/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function.
\| \| * \| \| \| \| \| \| \|	minor: remove a small amount of code duplication	Justin Clark-Casey (justincc)	2011-04-15	1	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2011-04-15	3	-4/+26
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	BlueWall	2011-04-14	8	-53/+20
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Add ColladaMesh switch	BlueWall	2011-04-14	3	-4/+26
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	refactor: split out some rez code into a separate CreateItemForObject() method	Justin Clark-Casey (justincc)	2011-04-15	1	-143/+159
\| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	get rid of all traces of the now used mock service infrastructure	Justin Clark-Casey (justincc)	2011-04-15	8	-45/+17
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	remove old code for a mock grid service, which got removed some time back	Justin Clark-Casey (justincc)	2011-04-15	1	-8/+3
\| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	remove any reference to a mock authentication service since it doesn't exist ↵	Justin Clark-Casey (justincc)	2011-04-15	1	-12/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and we don't use it
\| \| * \| \| \| \| \| \| \|	remove mock asset service for tests in favour of always using the real one	Justin Clark-Casey (justincc)	2011-04-15	3	-133/+8
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove the mock inventory service for tests and just use the real one all ↵	Justin Clark-Casey (justincc)	2011-04-15	2	-199/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the time with an in-memory data plugin
\| \| * \| \| \| \| \| \| \|	extend TestLoadCoalesecedItem() to check loaded object ids and positions	Justin Clark-Casey (justincc)	2011-04-15	1	-1/+7
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Make all the objects in a coalescence reappears after being loaded from an ↵	Justin Clark-Casey (justincc)	2011-04-15	10	-39/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
\| \| * \| \| \| \| \| \| \|	implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.	Justin Clark-Casey (justincc)	2011-04-14	3	-6/+64
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	simplify InventoryArchiveTestCase setup	Justin Clark-Casey (justincc)	2011-04-14	1	-18/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	simplify TestSaveItemToIarV0_1()	Justin Clark-Casey (justincc)	2011-04-14	1	-18/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	simplify TestRezObject()	Justin Clark-Casey (justincc)	2011-04-14	1	-17/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Make scene object parts created by the test utils unit sized.	Justin Clark-Casey (justincc)	2011-04-14	2	-5/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2011-04-14	1	-1/+5
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Comment out the warning if the prioritizer runs without a fully	Mic Bowman	2011-04-13	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	initialized scene presence. Not sure why we are dumping updates to a client that isn't there yet...
\| \| * \| \| \| \| \| \| \| \|	simplify coalesced object tests by using existing scene object set up utils	Justin Clark-Casey (justincc)	2011-04-14	2	-41/+20
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this change makes it possible to set an absolute position on a group before it is put into a scene.
\| \| * \| \| \| \| \| \| \|	Use common coalesced serialization code for both tests and the ↵	Justin Clark-Casey (justincc)	2011-04-13	1	-54/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	InventoryAccessModule. Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
\| \| * \| \| \| \| \| \| \|	Adjust the quanterions used in the rez coalsced object tests to get sensible ↵	Justin Clark-Casey (justincc)	2011-04-13	3	-5/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bounding box and offset numbers. Extend test to check position of objects in the rezzed coalescence.
\| \| * \| \| \| \| \| \| \|	refactor: move code to obtain the coalescence size and object offsets into ↵	Justin Clark-Casey (justincc)	2011-04-13	3	-16/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CoalescedSceneObjects from the serializer.
\| \| * \| \| \| \| \| \| \|	Fix bug where rezzing coalesced objects would give all objects the same name ↵	Justin Clark-Casey (justincc)	2011-04-13	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as the item. This now only happens for the first object (which was the item selected last when the coalesce was originally taken) This matches the expected behaviour of the environment as seen on the Linden Labs grid.
\| \| * \| \| \| \| \| \| \|	Add coalesced scene objects class and serializer. This is currently only ↵	Justin Clark-Casey (justincc)	2011-04-13	8	-9/+389
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	used by the TestRezCoalescedObject() regression test. This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc. Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item. Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place. This bug will be addressed shortly.
\| \| * \| \| \| \| \| \| \|	factor out some test code into the SetUp()	Justin Clark-Casey (justincc)	2011-04-13	1	-14/+15
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add a regression test for rezzing a single object into a scene from user ↵	Justin Clark-Casey (justincc)	2011-04-13	4	-1/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inventory
\| \| * \| \| \| \| \| \| \|	force mesh proxy for simple box prims with path cut	dahlia	2011-04-12	2	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵	Diva Canto	2011-04-12	30	-472/+338
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.