4cb8967f0a
Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster
2013-03-29 01:08:33 +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
3d52629d60
Merge commit '3f0f313a764213e928aeb57968efbdd0e4c851cd' into careminster
2013-03-27 01:17:55 +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
7b95c22129
Merge commit '5f4c4df227025c6b6156ce8238b56553dca4b5ae' into careminster
2013-03-26 19:06:39 +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
8742c141d9
Merge branch 'master' into careminster
2013-03-22 01:20:06 +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
Melanie