f0320f5652
The previous commit did fix the infinity problem! I'm putting the same time on TP_V1 and adding a big red warning on top of those lines.
2013-07-24 14:31:18 -07:00
46d017b197
Today's wild shot at the infinity problem. Wait on the child agent left behind.
2013-07-24 14:31:03 -07:00
4e5c7bdeb3
Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that eliminates the temporary placement at infinity upon TPs
2013-07-24 14:30:13 -07:00
e6a0f6e428
One more thing to test in order to let CompleteMovement go up the stack.
2013-07-24 14:29:51 -07:00
14530b2607
Minor adjustment on timings of waits.
2013-07-24 14:29:37 -07:00
c0433d5e4c
Changed the RegionHandshake packet to the Unknown queue, so that it is sent with high priority and hopefully gets to the client before AgentMovementComplete
2013-07-24 14:29:15 -07:00
879cbb4575
This commit message intentionally left blank (last commit was idiotic)
2013-07-24 14:28:55 -07:00
261512606d
Improve the opening test in CompleteMovement, to account for multiple flags besides ViaLogin.
2013-07-24 14:28:41 -07:00
d7984ef775
More on putting TP V1 as it was
2013-07-24 14:28:27 -07:00
aaee63af82
Minor improvements on TP V1 trying to make it exactly as it was before.
2013-07-24 14:28:14 -07:00
3891a8946b
New Teleport protocol (V2), still compatible with V1 and older. (version of the destination is being checked)
...
In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions.
This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region.
Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
2013-07-24 14:27:58 -07:00
aae29c0ee2
Further tweaks on TPs: not sending the callback URL and instead waiting 15sec before closing the agent. This seems to be working fairly well. The viewer seems to have an 8 sec delay between UseCircuitCode and CompleteMovement.
...
Also added back the position on UpdateAgent, because it's needed for TPing between neighboring regions.
2013-07-24 14:27:37 -07:00
9ab78d412c
EXPERIMENTAL: yet another variation of ES/EAC/TPFinish
2013-07-24 14:27:22 -07:00
00d4a26eef
Amend previous commit.
2013-07-24 12:49:30 -07:00
665fb66686
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-24 11:26:30 -07:00
e103e34f1d
Added config var that we all thought was already there: see_into_region. (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
2013-07-24 11:25:41 -07:00
d8a6eb5641
Decreased the time of group cache to 1 min, because it was getting on my nerves that it takes so long to let go of old info.
2013-07-24 11:25:24 -07:00
e82d4154a2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2013-07-24 04:45:07 +01:00
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
feef9d64a4
For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what looks like a very significant reducing in GUN occurrances
2013-07-23 23:42:34 +01:00
fa2653c8e1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-23 23:32:24 +01:00
9a4a513b5e
Correct issue where the last instance of a sampled stat was shown 3x larger than it should have been (though internal use was correct)
2013-07-23 23:31:35 +01:00
516062ae1f
Don't touch the Current Outfit folder also on coming back home
2013-07-23 15:05:32 -07:00
901bdfed40
Restoring landing on prims, which had been affected by the edit beams commit.
2013-07-23 14:31:16 -07:00
744276dd50
In renaming the folders for hypergriding, don't rename the Current Outfit folder. The viewer doesn't like that.
2013-07-23 14:31:03 -07:00
42e52f544d
Improvement of fetching name in groups
2013-07-23 14:30:50 -07:00
7c1eb86c7d
Don't post Link asset types back to the home grid
2013-07-23 14:28:53 -07:00
76e46d0158
Improve spacing between data and units on console stats display
2013-07-23 17:23:16 +01:00
aec8d1e6be
BulletSim: Turn on center-of-mass calculation by default.
...
Reduce object density by factor of 100 to bring physical mass computations
into a range better suited for Bullet.
2013-07-23 09:09:25 -07:00
f499b328c4
Revert "Revert "BulletSim: Add logic to linksets to change physical properties for""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 84d0699761
2013-07-23 08:14:20 -07:00
75686e0e49
Revert "Revert "BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 7b187deb19
2013-07-23 08:13:56 -07:00
b14156aa63
Revert "Revert "BulletSim: only create vehicle prim actor when vehicles are enabled.""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 5f7b2ea81b
2013-07-23 08:13:29 -07:00
aec8852af7
Revert "Revert "BulletSim: move collision processing for linksets from BSPrimLinkable""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit c45659863d
2013-07-23 08:13:01 -07:00
401c2e2f2e
Revert "Revert "Add experimental stubs for an extension function interface on both""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 89857378ce
2013-07-23 08:12:34 -07:00
af9deed135
Revert "Revert "BulletSim: freshen up the code for constraint based linksets.""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 44543ebe63
2013-07-23 08:11:21 -07:00
90528c23d9
For stats which can show average change over time, show the last sample as well as the average.
...
This is somewhat cryptic at the moment, need to improve documentation.
2013-07-23 01:13:13 +01:00
a57a472ab8
Add proper method doc and comments to m_dataPresentEvent (from d9d9959)
2013-07-23 00:51:59 +01:00
9fb9da1b6c
Add clientstack.InboxPacketsCount stat. This records the number of packets waiting to be processed at the second stage (after initial UDP processing)
...
If this consistently increases then this is a problem since it means the simulator is receiving more requests than it can distribute to other parts of the code.
2013-07-23 00:35:41 +01:00
60732c96ef
Add clientstack.OutgoingUDPSendsCount stat to show number of outbound UDP packets sent by a region per second
2013-07-23 00:35:34 +01:00
8396f1bd42
Record raw number of UDP receives as clientstack.IncomingUDPReceivesCount
2013-07-23 00:35:23 +01:00
bf517899a7
Add AverageUDPProcessTime stat to try and get a handle on how long we're taking on the initial processing of a UDP packet.
...
If we're not receiving packets with multiple threads (m_asyncPacketHandling) then this is critical since it will limit the number of incoming UDP requests that the region can handle and affects packet loss.
If m_asyncPacketHandling then this is less critical though a long process will increase the scope for threads to race.
This is an experimental stat which may be changed.
2013-07-23 00:35:09 +01:00
e6b6af62dd
Added check for user movement specification before discarding an incoming
...
AgentUpdate packet. This fixes the problem with vehicles not moving forward
after the first up-arrow.
Code to fix a potential exception when using different IClientAPIs.
2013-07-22 15:41:14 -07:00
44543ebe63
Revert "BulletSim: freshen up the code for constraint based linksets."
...
The changes don't seem to be ready for prime time.
This reverts commit 803632f8f3
2013-07-22 12:10:23 -07:00
89857378ce
Revert "Add experimental stubs for an extension function interface on both"
...
The changes don't seem to be ready for prime time.
This reverts commit 13a4a80b38
2013-07-22 12:09:55 -07:00
c45659863d
Revert "BulletSim: move collision processing for linksets from BSPrimLinkable"
...
The changes don't seem to be ready for prime time.
This reverts commit b4c3a791aa
2013-07-22 12:09:17 -07:00
5f7b2ea81b
Revert "BulletSim: only create vehicle prim actor when vehicles are enabled."
...
The changes don't seem to be ready for prime time.
This reverts commit acb7b4a09a
2013-07-22 12:08:49 -07:00
7b187deb19
Revert "BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable"
...
The changes don't seem to be ready for prime time.
This reverts commit d0d654e218
2013-07-22 12:08:25 -07:00
84d0699761
Revert "BulletSim: Add logic to linksets to change physical properties for"
...
The changes don't seem to be ready for prime time.
This reverts commit b44f0e1a00
2013-07-22 12:07:42 -07:00
b44f0e1a00
BulletSim: Add logic to linksets to change physical properties for
...
whole linkset.
Override physical property setting for BSLinksetCompound as there are
not children to the compound spape.
2013-07-22 10:27:24 -07:00
d0d654e218
BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable
...
and start changing the logic to handle the base prim as a complex
object (ie, a linkset).
2013-07-22 10:27:21 -07:00
Diva Canto