aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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)
| * | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-5/+54
| | | |
| * | | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
| | | |
* | | | 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)
* | | | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-272-4/+190
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-251-2/+190
| |\ \ \ | | |/ /
| | * | Documenting object-related eventsSignpostMarv2012-09-241-0/+43
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-244-12/+55
| | |\ \
| | * | | Documenting LSL script-related eventsSignpostMarv2012-09-241-2/+147
| | | | |
| * | | | Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-09-2416-181/+515
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | HG Rez object: warn the user if the item or asset cannot be found.Diva Canto2012-09-221-2/+7
| | | |
| * | | Guard against inventory get failures.Diva Canto2012-09-221-0/+3
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-0/+52
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-223-74/+38
| | |\ \
| | * | | Documenting non-LSL script-related eventsSignpostMarv2012-09-221-0/+52
| | | | |
| * | | | This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-212-10/+45
| | |/ / | |/| | | | | | | | | | Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-212-8/+150
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-222-19/+25
| | |\ \
| | * | | Fix llListFindList() returning no match when there is a match with a script ↵Justin Clark-Casey (justincc)2012-09-222-8/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant component in the source list. Adds regression test for this case. Based on http://opensimulator.org/mantis/view.php?id=6156 Thanks SignpostMarv.
| * | | | Moved the small HGUuidGatherer class to the file where its parent class is. ↵Diva Canto2012-09-213-74/+38
| | |/ / | |/| | | | | | | | | | No need to keep 2 separate files.
| * | | Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already ↵Diva Canto2012-09-211-18/+24
| | | | | | | | | | | | | | | | downloads the assets, so we don't need to do it again...
| * | | Minor: may avoid crashes of sims that still don't have this configuration ↵Diva Canto2012-09-211-1/+1
| |/ / | | | | | | | | | section.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-212-48/+49
| |\ \
| | * | Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't ↵Justin Clark-Casey (justincc)2012-09-212-9/+6
| | | | | | | | | | | | | | | | been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
| | * | Simplify UuidGatherer by performing asset fetch synchronously rather than ↵Justin Clark-Casey (justincc)2012-09-211-40/+44
| | | | | | | | | | | | | | | | using the async call but waiting for completion anyway!
| * | | HG 2.0: added asset import/export policies at the sim too.Diva Canto2012-09-211-8/+15
| | | |
| * | | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-203-9/+119
| |\ \
| | * | Don't fail to create an IRC nick if nick randomization is disabled in the ↵Justin Clark-Casey (justincc)2012-09-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | IRC module. Patch from http://opensimulator.org/mantis/view.php?id=6293 Thanks Starflower.
| | * | Documentation of teleport-related eventsSignpostMarv2012-09-201-0/+19
| | | |
| | * | minor tweaks to existing comments for IDE goodnessSignpostMarv2012-09-201-4/+7
| | | |
| | * | Documentation of agent-related eventsSignpostMarv2012-09-201-1/+34
| | | |
| | * | Documentation of object-related eventsSignpostMarv2012-09-201-1/+38
| | | |
| | * | Documentation of OnPluginConsoleSignpostMarv2012-09-201-0/+16
| | | |
| | * | Make ResendAppearanceUpdates = true by default in [Appearance] in ↵Justin Clark-Casey (justincc)2012-09-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
| * | | More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-201-15/+19
| |/ / | | | | | | | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
| * | Correctly override and call base OpenSimTestCase.SetUp() method in ↵Justin Clark-Casey (justincc)2012-09-193-6/+11
| | | | | | | | | | | | | | | | | | GridConnectorsTests and ArchiverTests. Remove unrelated compile warning from AttachmentsModuleTests.
| * | Cleanup from prev. commitBlueWall2012-09-181-2/+2
| | | | | | | | | | | | Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-3/+3
| | | | | | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
| * | Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-172-1/+72
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-12-30 16:26:27 +0000