aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent (follow)
Commit message (Collapse)AuthorAgeFilesLines
* why did u used RunInThread? change to RunInThreadPoolUbitUmarov2016-08-251-1/+1
|
* dont request a workjob if we can see there is nothing to doUbitUmarov2016-08-241-12/+18
|
* reduce xfer burst if we are busyUbitUmarov2016-07-111-3/+7
|
* change Xfermanager file sendingUbitUmarov2016-07-101-98/+192
|
* kick Xfermanager from heartbeat and expires files based on its timmingUbitUmarov2016-07-091-9/+57
|
* add a simple files expire to Xfer to catch some that never got a request ↵UbitUmarov2016-07-091-7/+25
| | | | (opened xfers also need a timeout) (not pretty code, but should not have heavy use)
* Allow default permissions from the viewer to be applied to uploaded objects.Melanie Thielker2016-04-291-1/+1
| | | | Make inventory items reflect coorect permissions immediately unstead of after relog
* add default eyes to default wearables, and revert previus bad commitUbitUmarov2015-12-041-2/+1
|
* add other Eyes asset id to xferupload defaultsUbitUmarov2015-12-041-2/+4
|
* fix a more few typosUbitUmarov2015-12-011-2/+2
|
* fix a few typosUbitUmarov2015-11-301-3/+2
|
* add a few more known texture IDsUbitUmarov2015-11-301-5/+15
|
* revert validating Library textures. Those need to be on a grid assets or ↵UbitUmarov2015-09-121-14/+0
| | | | will not work anyway
* try to validate textures from library folderUbitUmarov2015-09-121-0/+14
|
* send a reply on UpdateInventoryItem with the transactionID viewer sent. ↵UbitUmarov2015-09-121-1/+3
| | | | Protocol seems to have also a callbackID on this, apparently ignored by viewers ( as possible the transactionID )
* put back diva's cache with her recent fix but also avoid duplicated ↵UbitUmarov2015-09-111-10/+25
| | | | InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it
* seems to compile ( tests comented out)UbitUmarov2015-09-021-3/+1
|
* bad merge?UbitUmarov2015-09-014-24/+225
|\
| * Also fetch and store old asset for animation setsMelanie Thielker2014-09-271-2/+4
| |
| * Reinstate the part of the id theft protection that was lost in a long ago mergeMelanie Thielker2014-09-271-0/+20
| |
| * Add a sample use for the validationMelanie Thielker2014-09-251-0/+16
| |
| * Extend upload verification to all upload pathsMelanie Thielker2014-09-251-0/+2
| |
| * Merge branch 'master' into careminsterMelanie2013-11-031-0/+9
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ Merge branch 'master' into careminsterMelanie2013-08-071-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-2/+3
| | | | | | | | | | | | | | | | 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"
| * | | Merge branch 'avination' into careminsterMelanie2013-03-031-4/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| | * | | Reinstate uploading temporary texturesMelanie2013-02-271-4/+4
| | | | |
| | * | | Try to update inventory items when there is a valid asset - may fix temp ↵Melanie2013-02-271-0/+5
| | | | | | | | | | | | | | | | | | | | textures
| | * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch 'master' into careminsterMelanie2013-02-151-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-311-8/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-271-1/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-11-171-11/+20
| |\ \ \ \ \ \
| | * | | | | | Prevent a buffer overflow in asset receivingMelanie2012-11-171-11/+20
| | | | | | | |
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-11-132-0/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-122-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-121-8/+17
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-113-25/+74
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-09-272-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | | | | | | | | | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-242-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simply process it as if UUID.Zero had been given.
| * | | | | | | | | | | | Fix very recently introduced race condition where a CreateNewItem outracing ↵Justin Clark-Casey (justincc)2012-09-271-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an UploadAsset request could throw an exception because m_asset did not yet exist. This was accidentally introduced in 4fc0cfb This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation. The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves.
| * | | | | | | | | | | | Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was only used if none of new item, update item or update task item had been set. But since all transactions go through these paths this old code is redundant.
| * | | | | | | | | | | | Insert transaction ID into AssetXferUploader constructor rather than at ↵Justin Clark-Casey (justincc)2012-09-272-36/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first. This was preventing the previous race condition fix in 4fc0cfb from actually working. This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
| * | | | | | | | | | | | Move UDP update task item code to AssetXferUploader to match existing create ↵Justin Clark-Casey (justincc)2012-09-273-50/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user item and update user item mechanisms This is done for consistency and to allow removal or some access methods that increase code complexity. However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
| * | | | | | | | | | | | Fix occasional race condition failure when creating new clothing/body parts ↵Justin Clark-Casey (justincc)2012-09-273-110/+93
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the viewer or updating existing assets. On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem. It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail. So instead we always set up a Xfer object on either the asset or inventory item update request. This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
| * | | | | | | | | | | Fix slow loading of task inventoryMelanie2012-07-191-4/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-06-071-8/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-271-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-11-18 08:28:41 +0000