337b2e634a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-07-15 23:56:00 +02:00
1b81a2bd49
to stash
2012-07-15 23:54:24 +02:00
283df0610d
Save packets received while the client is added and replay them later.
2012-07-15 21:45:06 +02:00
8b4f7604e6
Revert "Experimentally handle UseCircuitCode synchrnonously"
...
This reverts commit e3fa73da96
2012-07-15 19:45:08 +02:00
e3fa73da96
Experimentally handle UseCircuitCode synchrnonously
2012-07-15 17:17:59 +02:00
1468b01afc
coment out some of previus debug messaged before forgetting about them...
2012-06-22 18:29:46 +01:00
646b7fb8f2
i more debug
2012-06-22 18:10:53 +01:00
ba58d7a9b2
add a temp debug message
2012-06-22 18:04:12 +01:00
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
80ec2ac167
Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5
2012-02-16 01:39:12 +00:00
df960d5767
Add known identity informatio nto log message if an exception is thrown during LLUDPServer.HandleUseCircuitCode()
2012-02-16 01:25:54 +00:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
5e445aaf7b
Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTICS to count the number of times clients are disconnected due to ack timeouts.
...
This has been broken for a long period and would only ever show 0.
2012-01-24 22:09:13 +00:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
2011-12-08 19:25:24 +00:00
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
080a41e9f9
Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge
2011-10-25 01:35:30 +01:00
f9ffd2538f
Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection
2011-10-12 19:22:30 +01:00
1b3ea64fe9
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-11 23:21:36 +01:00
37ae6451f9
Remove vestigal RegionStatus.SlaveScene.
...
This appears to be code clutter since the code that uses this has long gone.
2011-10-03 23:25:09 +01:00
c4ffcd4b7d
Ensure that packet headers get parsed correctly
2011-07-27 09:12:00 +01:00
04eaca2af8
Ensure that packet headers get parsed correctly
2011-07-27 08:35:19 +02:00
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
ubit