aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-141-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-311-8/+10
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | minor: Tidy up disabled logging on AssetTransactionModule for future use. ↵Justin Clark-Casey (justincc)2013-01-291-8/+10
| | | | | | | | | | | | Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.
* | | Merge branch 'master' into careminsterMelanie2013-01-271-1/+2
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * 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. 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
| * | Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-132-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
| | |
* | | 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
| * | Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-122-2/+2
| | | | | | | | | | | | grepping for remaining uses
* | | 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
| * | J2KDecoderModule: move the code out of PostInitialise()Diva Canto2012-11-111-8/+17
| | |
* | | 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
| * | One more module converted: XferModule.Diva Canto2012-11-101-9/+24
| | |
| * | One more module converted: J2KDecoderModule.Diva Canto2012-11-101-10/+32
| | |
| * | One more more converted: IPBanModule.Diva Canto2012-11-091-6/+18
| | |
| * | Fix very recently introduced race condition where a CreateNewItem outracing ↵Justin Clark-Casey (justincc)2012-09-251-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-251-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-252-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-253-64/+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-253-110/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | 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
| * Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-071-8/+7
| | | | | | | | Also change code to grab the agent asset transaction module once.
* | Merge branch 'master' into careminsterMelanie2012-03-271-1/+21
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-1/+21
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-01-281-1/+1
|\ \ | |/
| * Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-281-1/+1
| | | | | | | | agent id anyway
* | Merge branch 'master' into careminsterMelanie2012-01-061-11/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Improve "j2k decode" command to tell us how many layers and components were ↵Justin Clark-Casey (justincc)2012-01-051-5/+16
| | | | | | | | decoded, instead of just success/failure
| * Add a "j2k decode" region console command that allows a manual request for a ↵Justin Clark-Casey (justincc)2012-01-051-8/+10
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Minor formatting changes and commented out log lines for future debugging of ↵Justin Clark-Casey (justincc)2012-01-041-0/+4
| | | | | | | | image manager (udp texture fetch). No significant functional changes.
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
generated by cgit v1.1 at 2024-12-19 17:36:53 +0000