4fc0cfba3c
Fix occasional race condition failure when creating new clothing/body parts 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)
2012-09-25 21:35:39 +01:00
77355295da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 10:46:42 -07:00
4ec2fc4cc2
Deleted extraneous debug message
2012-09-25 10:46:21 -07:00
ef3d44240e
missed change
2012-09-25 04:03:15 +01:00
4d681bfde6
do the same to webFecthInvDescModule
2012-09-25 03:59:19 +01:00
2cb17d6fbb
change GetTextureModule processing
2012-09-25 03:38:45 +01:00
020103c51e
Documenting object-related events
2012-09-24 22:59:02 +01:00
ac02cadbdb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-24 22:52:33 +01:00
1cfd63d0b4
Documenting LSL script-related events
2012-09-24 22:44:37 +01:00
421071bd8a
Text changes for upload messages
2012-09-24 23:19:57 +02:00
a1a0a90720
more upload changes (plus untouch prebuild.xml)
2012-09-24 22:57:33 +01:00
7ae0b5e605
touch prebuild.xml
2012-09-24 21:28:03 +01:00
ca67ee60ac
add missing transactionID in SendInventoryItemCreateUpdate. and make use
...
of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
2012-09-24 21:22:08 +01:00
bbaf2c5a80
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-24 20:14:00 +01:00
ca9d3760ab
Merge branch 'ubitwork' into avination
2012-09-24 17:41:48 +02:00
6963b96bd0
If an asset upload transaction doesn't exist for a CreateInventory request,
...
simply process it as if UUID.Zero had been given.
2012-09-24 13:41:48 +02:00
68ece236a6
Protect the responses map with a lock. Also remove ugly "this." type of
...
member notation.
2012-09-23 23:55:28 +02:00
b8119ada59
Merge branch 'ubitwork' into avination
2012-09-23 23:47:56 +02:00
2d02405186
Change the poll service to use a thread pool for replies to make sure the
...
event queues aren't blocked by other traffic.
2012-09-23 23:16:25 +02:00
a5d969d92f
Comment out asset error for sculpts/meshes. If an asset is missing it's missing.
...
We can't put it back so we don't need to know.
2012-09-23 20:57:36 +02:00
291e57afb4
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
2012-09-23 19:18:49 +02:00
64db9e4114
try to allow free uploads for testing, if users prefix names with "TEST-". Let
...
textures get into inventory again. Both features under config control.
Have direct warnings to client, including a final one on upload complete
since i see nothing. problems: textures don't showup in inventory til
relog, also issues with permitions. A few more changes
2012-09-23 15:04:10 +01:00
1c42337381
HG Rez object: warn the user if the item or asset cannot be found.
2012-09-22 14:41:19 -07:00
87d810217e
Guard against inventory get failures.
2012-09-22 14:01:51 -07:00
772aedc731
Make BaseHttpServer throws say something useful.
2012-09-22 14:01:07 -07:00
11e05217df
report asset upload errors the right away
2012-09-22 21:14:15 +01:00
fb6d6e5cca
HG 2.0: User Agent Service now can also control where the local users can go. Domain-name and user-level based. \o/
2012-09-22 11:11:48 -07:00
4bba72b7af
removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some
...
more needed fields in request
2012-09-22 16:47:15 +01:00
7de67d5680
removed unused data in MeshUploadFlag response
2012-09-22 12:00:14 +01:00
48f4b32d7f
More HG 2.0: access control at the Gatekeeper. \o/
2012-09-21 21:03:14 -07:00
ebd99c9e3e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 17:59:42 -07:00
21a6ef5bb6
This fixes HG attachments' missing assets (textures, etc).
...
Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
2012-09-21 17:58:44 -07:00
a6f7328216
Remove deprecated parameters for region_id.
...
Remove deprecated parameters for region_id as anounced in january 2012.
2012-09-22 01:30:38 +01:00
b36ef60aca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 01:05:33 +01:00
8d7b1f8aa0
Documenting non-LSL script-related events
2012-09-22 00:57:29 +01:00
b0da4b8d13
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 16:45:35 -07:00
cfa022700d
Moved the small HGUuidGatherer class to the file where its parent class is. No need to keep 2 separate files.
2012-09-21 16:45:16 -07:00
9ab5c5040d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 00:26:32 +01:00
5df3944607
Fix llListFindList() returning no match when there is a match with a script constant component in the source list.
...
Adds regression test for this case.
Based on http://opensimulator.org/mantis/view.php?id=6156
Thanks SignpostMarv.
2012-09-22 00:23:25 +01:00
fb2ace6fff
Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already downloads the assets, so we don't need to do it again...
2012-09-21 15:55:58 -07:00
f931c0a868
Minor: may avoid crashes of sims that still don't have this configuration section.
2012-09-21 15:04:41 -07:00
f4cc19968c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 07:45:26 -07:00
b542622b3a
HG 2.0: added asset import/export policies at the sim too.
2012-09-21 07:44:18 -07:00
5f97b3e1d9
Minor: change the return value of unsuccessful posts to string.Empty.
2012-09-21 06:41:32 -07:00
f9c24c9414
read model upload cost parameters from config [Economy] section
2012-09-21 11:50:14 +01:00
e379566e6e
Improvement over last commit: refactor the asset permissions code, so that it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
2012-09-20 19:50:57 -07:00
80f486c778
minor: Make slow outgoing request log messages consistent with other log messages
2012-09-21 01:59:28 +01:00
632a42e2b1
Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't 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.
2012-09-21 01:57:13 +01:00
bceef401fa
Simplify UuidGatherer by performing asset fetch synchronously rather than using the async call but waiting for completion anyway!
2012-09-21 01:36:23 +01:00
1b0abf8f0c
Comment out the long unused afaik HTTP agent handlers.
...
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.
2012-09-21 00:29:13 +01:00
Justin Clark-Casey (justincc)