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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-12-21	1	-0/+2
\|\
\| *	* Adds AbortXfer to the ClientAPI mix	Teravus Ovares (Dan Olivares)	2010-12-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
* \|	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-12-21	2	-9/+7
\|\ \ \| \|/
\| *	Shooting in the dark for solutions to the appearance problem	Mic Bowman	2010-12-20	2	-8/+8
\| \|
\| *	Fix notecards that end with an embedded object causing an exception	Melanie	2010-12-17	1	-2/+2
\| \|
\| *	Revamp the viewer -> banlist packet processing so fix a number of bugs.	Melanie	2010-12-13	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
* \|	Fix notecards that end with an embedded object causing an exception	Melanie	2010-12-16	1	-2/+2
\| \|
* \|	Revamp the viewer -> banlist packet processing so fix a number of bugs.	Melanie	2010-12-13	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
* \|	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-12-12	1	-1/+1
\|\ \ \| \|/
\| *	minor: remove some compiler warnings	Justin Clark-Casey (justincc)	2010-12-10	1	-1/+1
\| \|
* \|	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-12-09	1	-0/+81
\|\ \ \| \|/
\| *	Added ability for GetTexture to serve multiple formats. The format may come ↵	Diva Canto	2010-12-08	1	-0/+81
\| \| \| \| \| \| \| \|	as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
* \|	Update calling card interface	Melanie	2010-12-07	1	-1/+1
\| \|
* \|	Add the interface needed to revive calling cards	Melanie	2010-12-07	1	-0/+13
\| \|
* \|	Merge branch 'careminster-presence-refactor' of ↵	Melanie	2010-12-07	4	-8/+39
\|\ \ \| \| \| \| \| \| \| \| \|	ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
\| * \	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-12-06	3	-7/+38
\| \|\ \ \| \| \|/
\| \| *	Merge branch 'master-core' into mantis5110	Jonathan Freedman	2010-12-05	11	-178/+438
\| \| \|\
\| \| * \	Merge branch 'master-core' into mantis5110	Jonathan Freedman	2010-11-23	2	-1/+2
\| \| \|\ \
\| \| * \ \	Merge branch 'master-core' into mantis5110	Jonathan Freedman	2010-11-21	5	-3/+123
\| \| \|\ \ \
\| \| * \ \ \	Merge https://github.com/opensim/opensim into mantis5110	Jonathan Freedman	2010-11-21	4	-48/+47
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
\| \| * \ \ \ \	Merge git://github.com/opensim/opensim into mantis5110	Jonathan Freedman	2010-11-05	6	-4/+46
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' into mantis5110	Jonathan Freedman	2010-10-30	2	-16/+58
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' into mantis5110	Jonathan Freedman	2010-10-30	1	-4/+0
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into mantis5110	Jonathan Freedman	2010-10-30	5	-319/+151
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into mantis5110	Jonathan Freedman	2010-10-29	2	-23/+16
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into mantis5110	Jonathan Freedman	2010-10-29	1	-19/+116
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into mantis5110	Jonathan Freedman	2010-10-29	8	-546/+695
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
\| * \| \ \ \ \ \ \ \ \ \ \ \	Merge branch 'careminster-presence-refactor' of ↵	sacha	2010-12-04	2	-6/+26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	add more detail to the log in case of FORM Timeout	sacha	2010-12-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cause nothing relevant are in the services logs
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lock the attachments dict so it doesn't get out of sync when iterating	Melanie	2010-12-06	1	-35/+59
\| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-12-04	2	-6/+26
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Various bug fixes for appearance handling: more aggressive reset of textures ↵	Mic Bowman	2010-12-03	2	-10/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-12-03	5	-137/+380
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also prevent god takes from ending up in Lost and Found
\| * \| \| \| \| \| \| \| \| \| \| \|	Added some comments. Better than listening to the boring speaker...	Diva Canto	2010-12-01	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Diva Canto	2010-11-29	3	-30/+27
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix unit test.	Diva Canto	2010-11-29	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Preservation of creator information now also working in IARs. Cleaned up ↵	Diva Canto	2010-11-29	5	-113/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Changed the parser for InventoryItem deserialization. Moved some utility ↵	Diva Canto	2010-11-27	2	-30/+229
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	functions around.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Various bug fixes for appearance handling	Mic Bowman	2010-11-30	2	-5/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'careminster-presence-refactor' of ↵	Melanie	2010-11-27	1	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-11-27	1	-2/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Refactor appearance and avatar data sending code. Paritioning the routines ↵	Mic Bowman	2010-11-27	2	-28/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix handling of landmarks for systems with culture settings other than ↵	Marck	2010-11-26	1	-2/+10
\| \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	en_US. This fixes Mantis #5177.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument TI Dictionary to finally find that pesky script-caused deadlock	Melanie	2010-11-27	1	-3/+33
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-11-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Change all restarting to use the restart module. Remove hardcoded behavior	Melanie	2010-11-25	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Prevent an overlength button label from producing a debug dump and aborting	Melanie	2010-11-24	2	-28/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the script.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster-presence-refactor	Melanie	2010-11-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim	Melanie	2010-11-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Initialize InventoryItemBase.creatorData properly. Could throw.	Diva Canto	2010-11-23	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \|