21f30a1b5f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-26 22:49:05 +01:00
6cf51c329a
Merge branch 'ubitwork' into avination
2012-09-26 23:49:02 +02:00
2998a2df6a
Streamline and improve llGetMass
2012-09-26 22:30:09 +02:00
90dd5844d6
Add basic undo/redo regression tests.
2012-09-26 21:28:43 +01:00
a70352db17
don't send a partial contents report if we are sending all data
2012-09-26 21:03:31 +01:00
3c77b8f463
Use GridUser properly for foreign users.
2012-09-26 12:40:41 -07:00
c3ea00f16e
add assettype mesh to list of binary assets
2012-09-26 20:31:34 +01:00
80133f9ebe
Show the user's home url too on the console command.
2012-09-26 11:27:31 -07:00
2f61763923
Not really a change, just added a reminder to fix something here.
2012-09-26 11:26:51 -07:00
9a04269644
fix GetTextureHandler range
2012-09-26 16:49:39 +01:00
be9cef8682
missing file
2012-09-26 16:20:26 +01:00
617f1b9223
just remove the damm thing
2012-09-26 16:17:49 +01:00
7e3eba1064
Seems nothing actually need the request body for getevents. so change
...
control flag to false
2012-09-26 15:41:57 +01:00
abb4b9fcae
UriModule GetEvents also doesn't need a request body
2012-09-26 15:11:59 +01:00
67fa657746
keep watchdog happy using it to kill his threads
2012-09-26 04:52:19 +01:00
7d2cd0d935
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 20:04:10 -07:00
ae58cf4224
TOS module. WARNING: migration in GridUser table.
2012-09-25 20:03:49 -07:00
495a3e7daf
Oops, that should be inside the curly bracket.
2012-09-25 19:54:42 -07:00
654dd289f2
more changes to PollService
2012-09-26 03:05:27 +01:00
5d986002fd
fix priorityQueue to correctly use the fairness counts starting at 8 for
...
nonimediate queues. Imediate queues where not taken into account so it
was unused.
2012-09-26 00:17:54 +01:00
92afa6aa44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 23:32:52 +01:00
ddd9384b39
Fix very recently introduced race condition where a CreateNewItem outracing an UploadAsset request could throw an exception because m_asset did not yet exist.
...
This was accidentally introduced in 4fc0cfb
2012-09-25 23:30:25 +01:00
4dc27aa91f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 18:14:06 -04:00
b96a53962b
Comment out old m_storeLocal from AssetXferUploader.
...
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.
2012-09-25 23:13:45 +01:00
3c2fb77133
Format OpenSim.ini.example
...
Make lines fint in 80x24 terminal for easier reading
2012-09-25 18:13:32 -04:00
eb5bec96e4
Insert transaction ID into AssetXferUploader constructor rather than at UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first.
...
This was preventing the previous race condition fix in 4fc0cfb
2012-09-25 22:54:20 +01:00
2f795e4fa6
Move UDP update task item code to AssetXferUploader to match existing create 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
2012-09-25 22:08:11 +01:00
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
Justin Clark-Casey (justincc)