aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
| | | |
* | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-2712-19/+147
|\ \ \ \ | | |/ / | |/| |
| * | | Use GridUser properly for foreign users.Diva Canto2012-09-265-8/+35
| | | |
| * | | Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| | | |
| * | | Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-254-234/+248
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-251-35/+65
| | |\ \
| | | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-09-254-191/+364
| | | |\ \
| | | * | | Format OpenSim.ini.exampleBlueWall2012-09-251-35/+65
| | | | | | | | | | | | | | | | | | | | | | | | Make lines fint in 80x24 terminal for easier reading
| * | | | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-257-5/+104
| | | | | |
| * | | | | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
| | | | | |
* | | | | | Merge commit 'ddd9384b3901f532243c1e8018334385b84290d1' into careminsterMelanie2012-09-270-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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)
* | | | | 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.
* | | | | Format OpenSim.ini.exampleBlueWall2012-09-271-35/+65
| | | | | | | | | | | | | | | | | | | | Make lines fint in 80x24 terminal for easier reading
* | | | | 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-249-27/+269
| | |\ \ \ | | | |/ /
| | * | | Documenting LSL script-related eventsSignpostMarv2012-09-241-2/+147
| | | | |
| * | | | Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-09-24108-455/+13520
|\ \ \ \ | |/ / / | | | | | | | | | | | | 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
| | | |
| * | | Make BaseHttpServer throws say something useful.Diva Canto2012-09-221-2/+2
| | | |
| * | | HG 2.0: User Agent Service now can also control where the local users can ↵Diva Canto2012-09-223-4/+136
| | | | | | | | | | | | | | | | go. Domain-name and user-level based. \o/
| * | | More HG 2.0: access control at the Gatekeeper. \o/Diva Canto2012-09-213-9/+76
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-212-74/+52
| |\ \ \ | | |/ /
| | * | Remove deprecated parameters for region_id.Michelle Argus2012-09-221-74/+0
| | | | | | | | | | | | | | | | Remove deprecated parameters for region_id as anounced in january 2012.
| | * | 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-223-19/+28
| | |\ \
| | * | | 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-212-1/+4
| |/ / | | | | | | | | | section.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-218-180/+210
| |\ \
| | * | minor: Make slow outgoing request log messages consistent with other log ↵Justin Clark-Casey (justincc)2012-09-211-7/+7
| | | | | | | | | | | | | | | | messages
| | * | 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!
generated by cgit v1.1 at 2024-12-23 08:39:24 +0000