Commit Graph

197 Commits (e88e2945e902a9f0edeb4f4d1b356ce77cdb4ee6)

Author SHA1 Message Date
Melanie Thielker f021c64eb0 Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache is long gone. 2016-12-29 12:34:09 +00:00
UbitUmarov c0f7e1edba why did u used RunInThread? change to RunInThreadPool 2016-08-25 03:55:56 +01:00
UbitUmarov 99c3b61bd9 dont request a workjob if we can see there is nothing to do 2016-08-24 06:20:04 +01:00
UbitUmarov 79fb13c95c reduce xfer burst if we are busy 2016-07-11 12:05:47 +01:00
UbitUmarov e6d57a1e49 change Xfermanager file sending 2016-07-10 15:25:05 +01:00
UbitUmarov 941971648e kick Xfermanager from heartbeat and expires files based on its timming 2016-07-09 13:45:29 +01:00
UbitUmarov 415c45b097 add a simple files expire to Xfer to catch some that never got a request (opened xfers also need a timeout) (not pretty code, but should not have heavy use) 2016-07-09 01:32:27 +01:00
Melanie Thielker d42de53dda Allow default permissions from the viewer to be applied to uploaded objects.
Make inventory items reflect coorect permissions immediately unstead of after relog
2016-04-29 21:23:32 +02:00
UbitUmarov a7079c9227 add default eyes to default wearables, and revert previus bad commit 2015-12-04 18:29:31 +00:00
UbitUmarov 0d8f62405c add other Eyes asset id to xferupload defaults 2015-12-04 17:34:49 +00:00
UbitUmarov c277dbd66c fix a more few typos 2015-12-01 09:42:28 +00:00
UbitUmarov b453ef0fbd fix a few typos 2015-11-30 19:47:58 +00:00
UbitUmarov fbef862aee add a few more known texture IDs 2015-11-30 19:45:44 +00:00
UbitUmarov 0eba5d25c3 revert validating Library textures. Those need to be on a grid assets or will not work anyway 2015-09-12 12:51:47 +01:00
UbitUmarov 8e920ac59d try to validate textures from library folder 2015-09-12 07:24:35 +01:00
UbitUmarov 8621abf2b7 send a reply on UpdateInventoryItem with the transactionID viewer sent. Protocol seems to have also a callbackID on this, apparently ignored by viewers ( as possible the transactionID ) 2015-09-12 02:05:52 +01:00
UbitUmarov 410ae96d04 put back diva's cache with her recent fix but also avoid duplicated InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it 2015-09-11 22:26:05 +01:00
UbitUmarov a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Justin Clark-Casey (justincc) ec8d21c434 Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis.
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
2014-11-25 23:23:10 +00:00
Melanie Thielker dbc0dfa606 Also fetch and store old asset for animation sets 2014-09-27 22:18:43 +02:00
Melanie Thielker f60139cb91 Reinstate the part of the id theft protection that was lost in a long ago merge 2014-09-27 21:17:56 +02:00
Melanie Thielker e37637587a Add a sample use for the validation 2014-09-25 22:03:02 +02:00
Melanie Thielker 3a42ea5279 Extend upload verification to all upload paths 2014-09-25 21:21:20 +02:00
Oren Hurvitz 99ac770abb Close streams immediately when we finish using them 2014-07-21 08:30:03 +01:00
Diva Canto 869191a51d Small change to my previous commit: not so aggressive on the trigger, please. 2014-07-04 16:28:37 -07:00
Diva Canto 78c155cd12 Instrument the UDP path of creating assets so that it triggers an asset post for users with different asset servers 2014-07-04 15:56:09 -07:00
Robert Adams 813f0da00b Add J2K decoder routine that converts directly to an image. 2014-01-19 07:32:41 -08:00
Melanie ba203ed94f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
Oren Hurvitz f106ba87ca Made terrain uploads thread-safe 2013-10-15 00:12:56 +01:00
Melanie 005c69511d Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
Diva Canto b857353fc9 Making the J2KDecoderModule decoder function async. Could this be the cause of sim freeze? -- HandleRequestImage in LLClientView is now sync, which means that it cannot take too long to complete. However, its execution path may end up in J2KDecoderModule.Decode, which is heavy and could stop the packet processing thread while it's at it. 2013-08-03 15:42:25 -07:00
Melanie 5f4c4df227 Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-26 03:40:06 +00:00
Melanie c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-24 18:56:28 +01:00
Melanie f39e4abf0e Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
2013-03-03 13:24:37 +00:00
Melanie adf03ad2e5 Reinstate uploading temporary textures 2013-02-27 18:43:51 +01:00
Melanie 698363990b Try to update inventory items when there is a valid asset - may fix temp textures 2013-02-27 18:19:38 +01:00
Melanie ea8c5ba707 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-15 21:42:16 +00:00
Justin Clark-Casey (justincc) 0ad07eb44d minor: remove some mono compiler warnings 2013-02-14 21:29:35 +00:00
Melanie 9a4de546fe Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00:00
Justin Clark-Casey (justincc) fd34a75cde minor: Tidy up disabled logging on AssetTransactionModule for future use. Make it clear that transaction parameter to HandleUDPUploadRequest is an ID. 2013-01-29 04:03:33 +00:00
Melanie c3d68e7f9d Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-01-27 01:09:01 +00:00
Melanie 776cc33541 Prevent items being destroyed by rename operations. Renaming of a wearable also
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.

Conflicts:

	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-01-27 01:07:37 +00:00
Melanie 380b017e32 Prevent items being destroyed by rename operations. Renaming of a wearable also
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
2013-01-27 00:20:34 +01:00
Melanie 7ad082f7c3 Merge branch 'avination' into careminster 2012-11-17 02:58:14 +00:00
Melanie 6faa7fc7f9 Prevent a buffer overflow in asset receiving 2012-11-17 02:31:56 +01:00
Melanie 556d70feef Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2012-11-13 17:37:39 +00:00
Diva Canto 608444c9f7 Another 21 modules' directives moved out of .addin.xml 2012-11-13 08:27:51 -08:00
Melanie 9a5679876e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00
Diva Canto 86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00