6571e7ead2
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:24:41 +02:00
ae833af3a9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-31 20:56:13 +01:00
f142e1f394
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-03-31 20:27:46 +02:00
4bf9c4bbb8
Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
...
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 20:25:32 +02:00
64a56059b1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-30 21:19:10 +00:00
9fee431cc8
In the flotasm asset cache, if we get a request for a file that we're actively writing, simply return null instead of first logging an exception.
2013-03-30 01:21:16 +00:00
f8785b5f47
refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
2013-03-30 00:29:52 +00:00
76629289f0
refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
2013-03-29 23:59:21 +00:00
cbc9ae898c
Added missing functionality (mainly custom headers) to llHTTPRequest.
2013-03-29 23:32:11 +00:00
d5d6a274a7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-29 23:28:47 +00:00
023faa227e
Check viewer 2/3 attachment calls against avatar appearance attachment data rather than actually attached objects
...
By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
2013-03-29 23:10:28 +00:00
f2f8248178
Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 02:42:47 +00:00
23ae4c0a4d
Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments.
...
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3ahttp://opensimulator.org/mantis/view.php?id=6578
2013-03-29 02:21:38 +00:00
e9eb837347
Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster
2013-03-29 02:21:20 +00:00
3696a668a8
Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster
2013-03-29 02:21:06 +00:00
7d466d36a3
Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster
2013-03-29 02:20:47 +00:00
e7d76c91c2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 02:19:12 +00:00
05810e48b0
Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-29 02:15:47 +00:00
c93f67b632
Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 01:58:57 +00:00
73710413cd
Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster
2013-03-29 01:52:58 +00:00
7d5eadf753
Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster
2013-03-29 01:52:45 +00:00
6954024fb2
Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster
2013-03-29 01:52:29 +00:00
abe885b3fe
Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster
2013-03-29 01:52:18 +00:00
120903efb6
Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 01:50:34 +00:00
e89bcf4f77
Revert "Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way."
...
Unfortunately fails on Nebadon's system right now. Needs investigation. May put in a temproary option for experimentation soon.
This reverts commit d87ddf50fc
2013-03-29 01:34:31 +00:00
4dfffa1df3
Add Location (relative), Rotation (Relative) and Rotation (World) to "show part" and other related console commands
2013-03-29 01:31:37 +00:00
d87ddf50fc
Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way.
...
On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up.
Trying this change to see if this is true for other people.
2013-03-29 01:16:29 +00:00
4cb8967f0a
Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster
2013-03-29 01:08:33 +00:00
285bd3abc8
Eliminate code which tries to restart attachment scripts in ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
2013-03-29 00:49:55 +00:00
c92654fb43
Stop attempts to update/add existing attachments in user inventory when teleporting between regions.
...
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
2013-03-28 23:57:35 +00:00
2b142f2f9e
Add "debug attachments" console command to allow highly verbose attachment logging to be switched on and off.
...
Default is off.
2013-03-28 23:09:35 +00:00
feffc8081d
minor: remove some mono compiler warnings from EntityTransferModule
2013-03-28 22:56:30 +00:00
03e421bf3d
minor: comment out unused Scene.AgentCrossing() to reduce code complexity
2013-03-28 22:55:13 +00:00
4ad9b27530
If the viewer has already rezzed any attachments itself, then ignore the simulator-side rez attachments call.
...
This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
2013-03-28 22:51:59 +00:00
3b377f16b2
Fix regression tests by making a new NPC always trigger simulator side attachment code when created.
...
Regression from previous commit c2093ccc
2013-03-28 22:44:59 +00:00
e97567e227
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-28 22:35:24 +00:00
c2093ccce1
Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary.
...
This is to simplify the code (no tricky 'wasChild' signalling required)
and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers)
and the viewer-side attaching the v3 viewers perform.
2013-03-28 22:07:58 +00:00
6a9630d2bd
BulletSim: fix race condition when creating very large mega-regions.
...
The symptom was exceptions while creating physical terrain.
Reduce default terrain mesh magnification to 2 from 3 because the
higher resolution uses a lot of memory and doesn't solve the terrain
smoothness for vehicles.
Added comments here and there and improved some debugging log messages.
2013-03-28 10:59:18 -07:00
3f9b274180
BulletSim: tweaks to terrain boundry computation. No functional changes.
2013-03-28 10:59:16 -07:00
9ca54d00d8
Add back a log message when we attempt a megaregion auto-reteleport
2013-03-28 02:29:34 +00:00
f548a41fb8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
2013-03-28 02:29:07 +00:00
afd0d6af07
minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if module was enabled.
2013-03-28 02:23:09 +00:00
d9c049fd9f
Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region is removed rather than base.AddRegion()
2013-03-28 02:20:43 +00:00
b05ed4ffa6
Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly in a megaregion, in the same manner at the "teleport user" console command.
...
This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening.
2013-03-28 02:17:32 +00:00
506d5e41bf
On the North and East sides of a megaregion, only consider regions within 256m to be neighbours rather than regions up to 512 distant.
...
This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides.
This reduces the number of child agents being logged into regions neighbouring a megaregion.
2013-03-28 01:54:11 +00:00
617637c788
minor: Fix usage error message for "debug eq" console command
2013-03-28 01:41:41 +00:00
b5b01e5bb5
Make HGLureModule track god like lures as well as normal lures, to see if this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active.
2013-03-28 01:37:52 +00:00
876d0d310f
Add "show eq" console command to show numbers of messages in agent event queues.
...
For debugging purposes.
2013-03-28 01:36:34 +00:00
f32027f3b5
Remove some Console.WriteLines accidentally left in last commit cfb20f09
2013-03-28 01:08:47 +00:00
cfb20f09a9
refactor: combine the checks for megaregion view range into a single place.
2013-03-28 00:57:43 +00:00
dd7d7683c9
Fix problem with megaregions where teleporting into a different region which already had a child agent would stop the eq working for the agent in the new region.
...
This was because the calculation as to whether a new agent was needed in the receiving region did not take megaregions into account,
unlike the original calculation when the user first teleported into the region.
This meant that on teleport, entity transfer would create a new CAP but this would be ignored by the viewer and receiving region, meaning that the EQ could no longer be used.
This would prevent subsequent teleport, amongst other things.
Currently, regions up to 512m from a megaregion are considered neighbours.
2013-03-28 00:12:48 +00:00
46b765d28e
Merge branch 'master' into careminster
2013-03-28 00:10:51 +00:00
e320046683
Merge branch 'master' into careminster
2013-03-27 01:17:59 +00:00
da5dbaf1d0
Add admin_get_agents xmlrpc method.
...
This allows one to retrieve information about agents from a particular region (name, id, position, etc.)
Similar to output from "show users"
See http://opensimulator.org/wiki/Remoteadmin:admin_get_agents for more details
2013-03-26 23:02:13 +00:00
3072f257f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 23:00:51 +00:00
abde0d4efb
BulletSim: prevent asset fetching loop when the fetched asset fails to mesh.
...
Check for the case where the fetched mesh asset fails meshing (degenerate
triangles or no physical mesh). In this case, the asset is marked 'failed'
and BulletSim doesn't keep trying to fetch over-and-over trying to get a
good asset.
2013-03-26 15:02:10 -07:00
13170ca627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 20:32:22 +00:00
3f0f313a76
Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars in a linkset.
...
llGetPrimitiveParams() works through PRIM_LINK_TARGET
Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
2013-03-26 20:25:58 +00:00
4365daa8e1
Merge branch 'master' into careminster
2013-03-26 19:06:44 +00:00
e82fab34d7
Implement a pref to turn on the simulator ExportSupported feature entry.
...
This tells the viewer to enable the UI for export permissions.
WARNING: If your inventory store contains invalid flags data, this will result
in items becoming exportable! Don't turn this on in production until it's complete!
2013-03-26 19:00:30 +00:00
5f4c4df227
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-26 03:40:06 +00:00
36c57bac8e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-03-26 03:26:28 +00:00
95d0a7d4fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-03-26 03:26:02 +00:00
285dc554ec
BulletSim: new algorithm for vertical attraction which uses quaternion
...
arithmetic to compute the shortest path between the current tilt
and vertical.
2013-03-25 15:40:46 -07:00
c96a6f1de6
BulletSim: small tweaks and formatting in the parameter fetching code.
2013-03-25 15:40:44 -07:00
953090fd62
BulletSim: fix possible race condition where an prim's asset can be requested quicker than the asset fetcher returns and thus falsely reporting that an asset was not fetched and defaulting the assset to a bounding box.
2013-03-25 15:40:43 -07:00
f783b9169f
BulletSim: parameterize C# HACD hull creation. Add feature of reducing max hull count for simple (non-cut prims) meshes.
2013-03-25 15:40:41 -07:00
128c72a234
Start recording inter-region teleport attempts, aborts, cancels and failures in statistics for monitoring/debugging purposes
...
These are recorded as 'entitytransfer' stats as seen by the "show stats entitytransfer" console command.
2013-03-25 21:53:27 +00:00
c341664c1b
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-24 18:56:28 +01:00
6ce9ed1a64
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-23 23:01:55 +00:00
8669586e18
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-03-23 11:45:52 +00:00
aba66c7112
Make sharing errors not spew and let the cache retry the files
2013-03-23 13:12:41 +01:00
8bc43ea773
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-03-23 11:31:34 +01:00
01636ca900
Fix teleporting into the non-SW 256x256 corner of a megaregion, though currently with a 10 second delay before auto-reteleport to the correct location.
...
This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent().
If left any later, it looks like the physics scene changes the position and stops the cross happening.
If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
2013-03-23 00:47:59 +00:00
93206ef0fa
Add "show borders" command to show the borders of a region.
...
This is relevant to mega-regions where the borders are very different to a regular region.
Also adds some method doc and other code comments.
2013-03-23 00:45:21 +00:00
c4d9a23f26
Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.
...
Also resolves an issue of multiple chatting if the originating simulators had more than one region and they were neighbours
2013-03-22 01:43:18 +00:00
1f17ef6d3c
Take out a testing sleep I accidentally left in the teleport code from last commit 7471bc7
2013-03-22 01:06:56 +00:00
d5e5c13f3b
Merge branch 'master' into careminster
2013-03-22 01:02:17 +00:00
68b910c1ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-03-22 01:01:24 +00:00
7471bc7775
At strategic points in the teleport process, if the client has simultaneously logged out then do not continue.
...
This aims to reduce any side effects if the process tries to complete after the client has logged back in (e.g. it was delayed due to a slow destination region response).
This introduces a new Aborting entity transfer state which signals that the teleport should be stopped but no compensating actions performed.
2013-03-22 01:00:13 +00:00
476a7d3eee
Implement chat across region borders since we can tell if avatars in neighbouring regions are in range.
2013-03-22 00:03:10 +00:00
e23a0dcc5d
minor: On teleport, signal a child agent before we send the viewer TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour.
...
If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root.
This closes the original presence which we don't really want to do.
This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
2013-03-21 23:37:23 +00:00
46c833810c
On a teleport, lock m_agentsInTransit whilst we grab the value to check for completion just to be sure we're not using a thread cached version.
2013-03-21 00:46:08 +00:00
cc504eb0d1
Fix SceneManager to use the new automatic property throughout.
2013-03-21 01:44:09 +01:00
4de530af45
minor: disable logging on regression TestCrossOnSameSimulator() that I accidentally left on a few commits ago.
2013-03-20 23:13:12 +00:00
b1cd1d917e
minor: don't bother with the pause before rezzing attachments if we are running regression tests (fire and forget calls launched on the same thread).
...
Also adds code comments as to why this pause exists.
2013-03-20 23:12:13 +00:00
16af5b87f8
Add file missing from last commit 36651be
2013-03-20 23:08:35 +00:00
36651bed71
On the later forms of teleport failure, tell the user if this was because viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion.
...
Also adds regression test for the case where the viewer couldn't connect with the destination region.
Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
2013-03-20 23:01:16 +00:00
8de933ab07
Insert a short delay on the simulator side rezzing of attachments in order to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions.
...
This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar.
This doesn't affect version 1 viewers since this delay is shorter than the login delay.
This doesn't increase the login time since this part of the process was already being performed asynchronously.
This may be a temporary solution.
2013-03-20 02:09:25 +00:00
c0ff5635ba
Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013)
...
This break was not connected with the recent attachment code changes.
2013-03-20 02:00:56 +00:00
3cb1c23554
Force a viewer object update for attachments at the end of the final Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region.
...
For some reason, sending updates before this will not have this effect.
This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
2013-03-20 01:46:50 +00:00
9151b9d233
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-20 01:36:28 +00:00
90b9121e66
BulletSim: change 'degenerate mesh' message from Error to Debug because there
...
seem to be lots of sculpties with this problem while the condition really doesn't
change region operation.
2013-03-19 17:15:24 -07:00
3648164219
Prevent multiple instances of the same item ID being appended to an AvatarAppearance
...
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
2013-03-19 21:49:29 +00:00
c2e4f8aed5
For the moment, disable the output of the 'scene' statistics in SimExtraStatsCollector
...
and thus for the command 'show stats' because it is ugly and most of the information
is already output in the formatted printout that appears before.
2013-03-19 12:37:44 -07:00
1dd2d432f1
For those people collecting and comparing logfiles from servers scattered
...
around the world, change LogWriter to use DateTime.UtcNow rather than
DateTime.Now.
2013-03-19 11:40:10 -07:00
8360223fed
BulletSim: code to generate a higher resolution terrain mesh. Parameter
...
TerrainMeshMagnification controls number of vertices generated per
heightmap point. Default is 3.
2013-03-19 00:00:03 -07:00
8510f57ad4
BulletSim: add terrain contact processing threshold parameter. Initialize contact processing threshold for static object as well as mesh terrain.
2013-03-19 00:00:02 -07:00
8d9bfda727
Merge branch 'avination' into careminster
2013-03-19 01:24:14 +00:00
566ab7ccf9
Fix merge artefacts
2013-03-19 01:19:33 +00:00
8553a37881
Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-19 01:00:09 +00:00
5b950ca36a
Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster
2013-03-19 00:54:23 +00:00
397379cd3f
Process default attachment point in AttachObjectInternal before we check whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
2013-03-19 00:39:58 +00:00
55ab6f015a
Fix tests for multiattach
2013-03-18 23:48:03 +00:00
5e1f651e21
Merge branch 'master' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:31:27 +00:00
0635d9d174
Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:21:01 +00:00
e4a70b9f9a
Limit each attachment point to 5 items as per spec
2013-03-18 22:56:26 +00:00
d07943c262
Multiattach, part 2
2013-03-18 22:56:17 +00:00
fcecfc81bb
Multiattach, part 1
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-18 22:56:03 +00:00
3611d33b00
Improve rejection of any attempt to reattach an object that is already attached.
...
This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
2013-03-18 22:04:27 +00:00
a7a9a8a614
Fix recent regression where an item worn to an attachment point that was already occupied did not remove the previous attachment (current behaviour)
...
Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013)
Added regression test for this case.
2013-03-18 20:48:50 +00:00
46a81b3527
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-03-17 23:07:12 +00:00
464201b41d
BulletSim: add INI parameter for angular banking timescale fudge parameter.
2013-03-16 15:34:07 -07:00
fc84ebb819
BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis)
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-16 15:13:40 -07:00
455da9dd20
* Ignores VolumeDetect enabled prim in the camera raycast call. Note: The SceneRaycast call doesn't have a filter option in the interface and physics will use the lower level one for all sorts of goodies so it wouldn't be appropriate to ignore it at the physics layer yet.. though that would be better once the API has filters.
2013-03-16 11:09:49 -04:00
6e1b3f9951
*Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
2013-03-16 03:14:11 -04:00
f081b7e9ef
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
2013-03-16 01:48:04 +01:00
1dcdea6ac4
Fix case where the string member of a LSL_String in a list is null
2013-03-16 01:47:26 +01:00
03075359b5
Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years.
2013-03-15 23:48:40 +00:00
7e5d553781
Make the LSL memory functions virtual so script engines can override them if they have different memory management.
2013-03-15 23:46:49 +00:00
b9146a7922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-15 23:45:32 +00:00
35843e8ec8
Change the table and field names of XAssetService mysql db tables to be capitalized like Avatars, Friends, etc.
...
Also fixes access time being set on assets rather than XAssetsMeta
This is to try and be somewhat consistent with other service tables that are mainly in this style.
No migration is supplied, since nobody should be using this service yet except on a test basis.
2013-03-15 23:42:16 +00:00
e9f3cd1a60
Implement access time updates on assets for XAssetService.
...
This only happens if access time is older than 30 days currently, in order to reduce database updates.
The idea is to give some idea of assets which haven't been accessed for a very, very long time.
These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain.
This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself.
And many metadata entries may point to the same data. Probably need to address this.
2013-03-15 23:17:54 +00:00
45dee383db
refactor: Reuse Get() method in AssetService to eliminate some copy/paste in other Get methods
2013-03-15 22:42:34 +00:00
bd0c1d9b6a
Migrate assets from chained asset service to xassetservice as they are requested.
...
This shrinks the asset database over time as duplicate assets are fetched.
2013-03-15 22:33:39 +00:00
d05af4bdad
Fix bug in AssetService where requesting data only for an asset would throw an exception if the asset did not exist.
2013-03-15 22:14:34 +00:00
7fb458b055
minor: log an error rather than info if a connector fails to load.
2013-03-15 22:08:11 +00:00
3a7d9f740e
minor: Make logged message in ServerUtils more consistent.
2013-03-15 22:05:18 +00:00
8cc3adb585
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-15 21:57:25 +00:00
924d6e892a
Make it possible to chain another asset service underneath the de-duplicating XAssetService.
...
This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand.
Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService")
Not yet ready for use.
2013-03-15 21:53:39 +00:00
78b25094dc
BulletSim: Tweak vertical angular attraction to remove double VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-15 14:05:38 -07:00
c10c43d6f6
Fix server statistics always reporting zero for total network bytes in/out.
...
Clean up some parameter code in Statistics.Binary.
2013-03-15 13:59:34 -07:00
d3e76730bd
Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object.
2013-03-15 00:49:35 +00:00
cb74186888
Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is necessary to get attributes to save (though this probably happens anyway due to the prim move)
2013-03-15 00:27:06 +00:00
e25ba116a3
refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity() method
2013-03-15 00:06:42 +00:00
081271e1d7
minor: remove mono compiler warnings in LSL_Api.cs
2013-03-14 23:44:16 +00:00
12900ea84e
Log same environment information to Robust log as is already done for simulator logs, for debug purposes
2013-03-14 23:39:15 +00:00
2fbc08d7dd
refactor: minor cleanup in osGetAvatarList()
2013-03-14 23:19:18 +00:00
0ea0f8aa83
Fix bug in osCauseHealing() if called with an avatar ID for an avatar that is not in the scene.
2013-03-14 23:16:39 +00:00
56b333f301
minor: Use more compact libomv primitive constructors in osNpcGetPos() and osNpcGetRot()
2013-03-14 23:12:58 +00:00
55204ccde6
Fix minor race conditions in OSSL_Api functions where a parcel could be misidentified for moving prims.
2013-03-14 23:09:59 +00:00
f8dab4f93f
refactor: Use LSL_Vector(Vector3) constructor in llCastRay()
2013-03-14 23:06:54 +00:00
ca99f418d8
refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than having to continually take intermediate Vector3s to avoid race conditions
2013-03-14 23:05:21 +00:00
c1115e4c2e
Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()
...
This conforms to the existing ILandChannel.ParcelsNearPoint() method
2013-03-14 22:56:26 +00:00
c09f4ff483
Fix minor race condition in llGetCameraRot() where inconsistent information could be returned for a rotating camera
2013-03-14 22:49:08 +00:00
114fd042de
Fix minor race condition in llGetCameraPos() where an inconsistent post could be returned for a moving camera
2013-03-14 22:46:27 +00:00
d4b109b4c4
Fix minor race condition in llParcelMediaCommandList() where a parcel could be misidentified for a moving prim
2013-03-14 22:45:00 +00:00
2a81eb8d45
Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, PRIM_SIZE and PRIM_ROT_LOCAL
...
This function is used by all the various ll*Params() and os*Params() functions
2013-03-14 22:42:11 +00:00
b23009e480
Fix minor race condition in llGetGeometricCenter() if this was changing whilst the function was called.
2013-03-14 22:35:41 +00:00
a6f8638174
refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation()
2013-03-14 22:34:48 +00:00
Melanie