22202 Commits (f9680d62edcaa171c6b260845809b92e2ea800cd)

All Branches

Search

Author	SHA1	Message	Date
Melanie	e7932682a2	Add a logger so the prior commit will work	2012-09-12 21:24:09 +02:00
Melanie	d8e9188908	Stop expiry timer when upload is complete. Log if timeout is reached.	2012-09-12 21:14:55 +02:00
Melanie	5139db2638	Add a timer to time out upload caps handlers that are not used.	2012-09-12 12:56:59 +02:00
BlueWall	81fda6f947	Revert "Fix prebuild.xml format for reference" ... This reverts commit 96f889b20e.	2012-09-11 23:43:37 -04:00
BlueWall	e9322b0bf7	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	2012-09-11 22:58:21 -04:00
BlueWall	96f889b20e	Fix prebuild.xml format for reference ... Mono.Data.SQL entry was bad	2012-09-11 22:56:29 -04:00
Justin Clark-Casey (justincc)	224efe7b76	minor: Comment out friends notification log spam for now.	2012-09-12 01:58:01 +01:00
Justin Clark-Casey (justincc)	ebb394bbda	Fix indentation and issues where tabs were used instead of spaces in commit 783ee949	2012-09-12 01:45:34 +01:00
SignpostMarv	c17965eec4	mathematically & hypothetically speaking we want to avoid negative values being written	2012-09-12 01:26:22 +01:00
Justin Clark-Casey (justincc)	4ead48f09f	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	2012-09-12 01:24:17 +01:00
SignpostMarv	41f3f2400e	Documentation of economy-related EventManager events	2012-09-12 01:23:47 +01:00
Mic Bowman	f06394f195	Allow an incoming identifier to be specified for a JsonStore.	2012-09-11 16:42:07 -07:00
Justin Clark-Casey (justincc)	d53a53d4c5	Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.	2012-09-12 00:10:48 +01:00
Justin Clark-Casey (justincc)	757d9163fa	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	2012-09-12 00:07:56 +01:00
Melanie	fd1ee58f87	Add a missing brace, remove a useless temp variable, enable charging.	2012-09-11 22:52:11 +02:00
UbitUmarov	013e94af5d	report mesh upload costs ( fake values)	2012-09-11 23:06:29 +01:00
Justin Clark-Casey (justincc)	25111e703f	Add levels 4 and 5 to "debug http" console command that will log a sample of incoming request data and the entire incoming data respectively. ... See "help debug http" for more details.	2012-09-11 21:48:51 +01:00
UbitUmarov	245763b1b0	let LLSDAssetUploadRequest include asset_resources information plus let ... NewAgentInventoryRequest know about mesh (does nothing with it still)	2012-09-11 20:30:30 +01:00
SignpostMarv	ad1b9bbba6	documentation (OnSceneObjectPartCopy)	2012-09-11 20:12:45 +01:00
SignpostMarv	97b8739c1d	documentation (OnRemovePresence)	2012-09-11 20:12:45 +01:00
SignpostMarv	0760121eb9	documentation (OnNewPresence)	2012-09-11 20:12:44 +01:00
SignpostMarv	0a22e78f59	documentation (OnClientConnect)	2012-09-11 20:12:44 +01:00
SignpostMarv	5e51f16ceb	documentation (OnBackup)	2012-09-11 20:12:44 +01:00
SignpostMarv	fd8a7e64b9	documentation (OnTerrainTick)	2012-09-11 20:12:44 +01:00
SignpostMarv	ed5f574356	documentation (OnTerrainTainted)	2012-09-11 20:12:44 +01:00
SignpostMarv	44349f742e	documentation (OnClientMovement)	2012-09-11 20:12:43 +01:00
SignpostMarv	e3993eefa5	Documenting some of the events on OpenSim.Region.Framework.Scenes.EventManager (OnFrame)	2012-09-11 20:12:43 +01:00
UbitUmarov	4ff7891506	Merge branch 'avination' into ubitwork	2012-09-11 18:55:30 +01:00
Melanie	19b00a5b3c	Removing the variable prica handler again. It's never called, was misnamed and ... probably never worked past the mesh beta.	2012-09-11 17:58:46 +02:00
Melanie	757a669924	Re-add the module and fix a typo	2012-09-11 17:55:33 +02:00
Melanie	375ca478dd	Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice ... which is the name actually used in viewer code.	2012-09-11 17:52:24 +02:00
Melanie	a6928a479e	Add cost calculation suppor tto the VariablePrice one as well	2012-09-11 17:51:20 +02:00
Melanie	ead4b8998c	Revert "Remove the unused NewFileAgentInventoryVariablePrice module." ... It's actually used. This reverts commit 94a8e5572b.	2012-09-11 17:28:37 +02:00
Melanie	bd1d9a214b	Add the option to have variable costing for uploads	2012-09-11 17:28:13 +02:00
Melanie	94a8e5572b	Remove the unused NewFileAgentInventoryVariablePrice module.	2012-09-11 15:07:32 +02:00
ubit	277d0923e7	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	2012-09-11 13:35:08 +02:00
UbitUmarov	0d5023b46b	fix prebuild.xml	2012-09-11 12:34:44 +01:00
ubit	ba6a2ec526	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	2012-09-11 13:32:26 +02:00
ubit	56105384ec	dummy commit	2012-09-11 13:32:05 +02:00
Melanie	a6753c14a5	Revamp the v3 inventory sending. Uses threads and some nifty mechanics to ... leverage the Poll Service without blocking it's workers.	2012-09-11 10:39:43 +02:00
Melanie	21c476228a	Merge branch 'avination' into careminster	2012-09-10 13:53:00 +01:00
Melanie	3e1b6b8d20	Merge branch 'master' into careminster	2012-09-10 13:33:47 +01:00
SignpostMarv	8db5d79f4b	passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly error messages	2012-09-10 13:15:32 +01:00
ubit	a2ace1b61a	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	2012-09-10 02:27:26 +02:00
UbitUmarov	a7250c6ea1	add a extra httppool thread to compensate for webfetchinventory	2012-09-10 01:23:20 +01:00
UbitUmarov	b7737b7273	webFetchInventory: change control event to simple flag, adjust locking	2012-09-10 01:20:34 +01:00
Melanie	657428a439	Remove commented code	2012-09-10 01:52:02 +02:00
Melanie	761bf8c1eb	Merge branch 'ubitwork' into avination	2012-09-10 01:50:41 +02:00
BlueWall	bf56b30024	Adjust namespce of FlotsamCache ... Place FloatsamCache in the same namespace as our other core asset caches	2012-09-09 14:35:48 -04:00
BlueWall	8321ecb7a2	Revert "Move addin information to CoreModulePlugin.addin.xml" ... This reverts commit 2ec34580ce. Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278.	2012-09-09 13:50:44 -04:00