Commit Graph

21166 Commits (9eca154bced7423867e8f9597b8baf214de79087)

Author SHA1 Message Date
Melanie a6928a479e Add cost calculation suppor tto the VariablePrice one as well 2012-09-11 17:51:20 +02:00
Melanie ead4b8998c Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
It's actually used.

This reverts commit 94a8e5572b.
2012-09-11 17:28:37 +02:00
Melanie bd1d9a214b Add the option to have variable costing for uploads 2012-09-11 17:28:13 +02:00
Melanie 94a8e5572b Remove the unused NewFileAgentInventoryVariablePrice module. 2012-09-11 15:07:32 +02:00
UbitUmarov 0d5023b46b fix prebuild.xml 2012-09-11 12:34:44 +01:00
Melanie a6753c14a5 Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
Melanie 21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
Melanie 3e1b6b8d20 Merge branch 'master' into careminster 2012-09-10 13:33:47 +01:00
SignpostMarv 8db5d79f4b passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly error messages 2012-09-10 13:15:32 +01:00
Melanie 657428a439 Remove commented code 2012-09-10 01:52:02 +02:00
Melanie 761bf8c1eb Merge branch 'ubitwork' into avination 2012-09-10 01:50:41 +02:00
UbitUmarov a7250c6ea1 add a extra httppool thread to compensate for webfetchinventory 2012-09-10 01:23:20 +01:00
UbitUmarov b7737b7273 webFetchInventory: change control event to simple flag, adjust locking 2012-09-10 01:20:34 +01:00
BlueWall bf56b30024 Adjust namespce of FlotsamCache
Place FloatsamCache in the same namespace as our other core asset caches
2012-09-09 14:35:48 -04:00
BlueWall 8321ecb7a2 Revert "Move addin information to CoreModulePlugin.addin.xml"
This reverts commit 2ec34580ce.

  Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278.
2012-09-09 13:50:44 -04:00
Melanie afb4e06f63 Reduce max concurrent endpoint connections from 50 to 6 (was 2 before) 2012-09-09 17:41:10 +02:00
Melanie 0556bbefdd Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM
to UUID.Zero because it ties up XMLRPC handlers needlessly.
2012-09-09 16:30:01 +02:00
Melanie 0d97beefce Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
SignpostMarv 783ee949ea implementing per-region configuration of limits on the number of prims one can have in a linkset
Applied with changes - patch was based on a repo different from core

Signed-off-by: Melanie <melanie@t-data.com>
2012-09-09 12:59:25 +01:00
Melanie d734c1985c Merge branch 'ubitwork' into avination 2012-09-08 18:03:17 +02:00
UbitUmarov a91ca984d5 llClientView: try to have only one thread per client processing
RegionHandleRequests. (code assumes packet handle is called async as it is not)
2012-09-08 12:22:40 +01:00
SignpostMarv e041f09750 refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3 2012-09-08 00:44:27 +01:00
Justin Clark-Casey (justincc) fa3edcf55c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-08 00:17:57 +01:00
SignpostMarv 874bde366a 4096 is used in various places as the maximum height of a region, refactoring to be a constant 2012-09-08 00:14:39 +01:00
Robert Adams d8df2d6bed BulletSim: update the DLLs and SOs 2012-09-07 16:05:34 -07:00
Robert Adams 126eae7100 BulletSim: Add Bullet body and shape to BSPhysObject and rename
'Body' to 'BSBody' for disambiguation when reading code.
Complete the API2 interface so nearly all methods on bullet
    classes are available to the managed code. The efficient
    single call simulation step is kept in place while all
    other creation/destruction/parameterization can be done
    in the managed code.
2012-09-07 16:05:28 -07:00
Robert Adams 3c097cb7a9 BulletSim: Add some comments (gasp) and log messages. 2012-09-07 16:05:22 -07:00
Robert Adams 189f51233e BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'. 2012-09-07 16:05:16 -07:00
Robert Adams 76dc29dc37 BulletSim: Modify collision flag calls to return the current flags.
Track current collision flags in BSPrim.
Add BulletSimAPI calls for saving and restoring rigidBodies using
    construction information structure.
2012-09-07 16:05:11 -07:00
SignpostMarv df3914c7cd renaming to markdown file 2012-09-08 00:02:27 +01:00
SignpostMarv 740eac192b multi-paragraph list item 2012-09-08 00:02:27 +01:00
SignpostMarv 783ecd01f4 headers 2012-09-08 00:02:26 +01:00
SignpostMarv a0e3e23aa9 removing redundant header; this is the building.txt file for opensim 2012-09-08 00:02:26 +01:00
SignpostMarv 1acee36822 code blocks 2012-09-08 00:02:26 +01:00
SignpostMarv ac90322f1b markdown-formatted link 2012-09-08 00:02:26 +01:00
SignpostMarv 2ca93cb144 renaming to markdown file 2012-09-08 00:02:26 +01:00
SignpostMarv 4e2805496c header syntax 2012-09-08 00:02:26 +01:00
SignpostMarv 46af3a3d92 casing 2012-09-08 00:02:26 +01:00
Melanie b379e790a2 Set the maximum number of concurrent connections to a service endpoint
to 50. This doesn't work on stock mono but it works in Avination and also
under Windoze.
2012-09-07 23:27:40 +02:00
Melanie 924df14c5e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
BlueWall 717b11856e Move addin attributes to RegionCombinerModule.addin.xml
Will help in automation of setting version info for addin dependencies.
2012-09-07 13:21:06 -04:00
BlueWall 0199abd625 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-07 11:43:22 -04:00
BlueWall 550f6c4ad2 Revert "Move addin information to RegionCombinerModule.addin.xml"
This reverts commit ab446bc692.
  Need to look into this
2012-09-07 11:41:47 -04:00
Diva Canto 2b506cffb1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-07 08:10:03 -07:00
Diva Canto 33469a0d2b Moved the new vars in Robust.HG.ini to the proper section. 2012-09-07 08:09:44 -07:00
BlueWall 1f18ce516f Move addin information to RegionCombinerModule.addin.xml
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
2012-09-07 11:07:19 -04:00
BlueWall 2ec34580ce Move addin information to CoreModulePlugin.addin.xml
Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
2012-09-07 10:18:00 -04:00
UbitUmarov 71d2d327d0 One more redundante ParcelProprieties on login 2012-09-07 12:50:38 +01:00
UbitUmarov c83dd021f3 stop sending duplicated parcelProprieties at login 2012-09-07 11:37:51 +01:00
UbitUmarov 23be1cf1cd remove fireandforget call to EnableChildAgents at end on CompleteMovement,
since this is already on own thread and its at the end of it.
2012-09-07 09:40:28 +01:00