| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | | |
|
| | | |
|
| | | |
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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)
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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)
|
| |\ \ \
| |/ / |
|
| | |\ \
| | |/ |
|
| | | | |
|
| | | |\ |
|
| | | | | |
|
| | | |/
| |/| |
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
go. Domain-name and user-level based. \o/
|
| | | | |
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | | |
Remove deprecated parameters for region_id as anounced in january 2012.
|
| | | |\ |
|
| | | | | |
|
| | | |/
| |/|
| | |
| | | |
Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
|
| | |\ \
| | |/ |
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
constant component in the source list.
Adds regression test for this case.
Based on http://opensimulator.org/mantis/view.php?id=6156
Thanks SignpostMarv.
|
| | | |/
| |/|
| | |
| | | |
No need to keep 2 separate files.
|
| | | |
| | |
| | |
| | | |
downloads the assets, so we don't need to do it again...
|
| | |/
| |
| |
| | |
section.
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
messages
|
| | | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | | |
using the async call but waiting for completion anyway!
|
| | | |
| | |
| | |
| | |
| | |
| | | |
As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead.
So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway.
If this facility is actually being used then please notify me or uncomment it if you are core.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this was already being done for outgoing HTTP requests.
This allows us to associate debug logging messages with the right request.
It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some.
This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled.
This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
|
| | | | |
|
| | | | |
|
| | |/
| |
| |
| | |
it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
|
| | |\ |
|
