Justin Clark-Casey (justincc)
4ead48f09f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-12 01:24:17 +01:00
SignpostMarv
41f3f2400e
Documentation of economy-related EventManager events
2012-09-12 01:23:47 +01:00
Mic Bowman
f06394f195
Allow an incoming identifier to be specified for a JsonStore.
2012-09-11 16:42:07 -07:00
Justin Clark-Casey (justincc)
d53a53d4c5
Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.
2012-09-12 00:10:48 +01:00
Justin Clark-Casey (justincc)
757d9163fa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-12 00:07:56 +01:00
Melanie
fd1ee58f87
Add a missing brace, remove a useless temp variable, enable charging.
2012-09-11 22:52:11 +02:00
UbitUmarov
013e94af5d
report mesh upload costs ( fake values)
2012-09-11 23:06:29 +01:00
Justin Clark-Casey (justincc)
25111e703f
Add levels 4 and 5 to "debug http" console command that will log a sample of incoming request data and the entire incoming data respectively.
...
See "help debug http" for more details.
2012-09-11 21:48:51 +01:00
UbitUmarov
245763b1b0
let LLSDAssetUploadRequest include asset_resources information plus let
...
NewAgentInventoryRequest know about mesh (does nothing with it still)
2012-09-11 20:30:30 +01:00
SignpostMarv
ad1b9bbba6
documentation (OnSceneObjectPartCopy)
2012-09-11 20:12:45 +01:00
SignpostMarv
97b8739c1d
documentation (OnRemovePresence)
2012-09-11 20:12:45 +01:00
SignpostMarv
0760121eb9
documentation (OnNewPresence)
2012-09-11 20:12:44 +01:00
SignpostMarv
0a22e78f59
documentation (OnClientConnect)
2012-09-11 20:12:44 +01:00
SignpostMarv
5e51f16ceb
documentation (OnBackup)
2012-09-11 20:12:44 +01:00
SignpostMarv
fd8a7e64b9
documentation (OnTerrainTick)
2012-09-11 20:12:44 +01:00
SignpostMarv
ed5f574356
documentation (OnTerrainTainted)
2012-09-11 20:12:44 +01:00
SignpostMarv
44349f742e
documentation (OnClientMovement)
2012-09-11 20:12:43 +01:00
SignpostMarv
e3993eefa5
Documenting some of the events on OpenSim.Region.Framework.Scenes.EventManager (OnFrame)
2012-09-11 20:12:43 +01:00
UbitUmarov
4ff7891506
Merge branch 'avination' into ubitwork
2012-09-11 18:55:30 +01:00
Melanie
19b00a5b3c
Removing the variable prica handler again. It's never called, was misnamed and
...
probably never worked past the mesh beta.
2012-09-11 17:58:46 +02:00
Melanie
757a669924
Re-add the module and fix a typo
2012-09-11 17:55:33 +02:00
Melanie
375ca478dd
Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice
...
which is the name actually used in viewer code.
2012-09-11 17:52:24 +02:00
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