5fd6f678a4
Moved auxiliar funtions of last commit from sop to lsl api since they are only used on one place each
2012-06-12 02:20:47 +01:00
b099f26376
Set IClientAPI.IsActive = false early on client removal due to ack timeout rather than using IsLoggingOut flag.
...
IsActive is more appropriate since unack timeout is not due to voluntary logout.
This is in line with operations such as manual kick that do not set the IsLoggingOut flag.
It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
2012-06-12 02:16:36 +01:00
c89db34fc4
If the simulator closes a root agent due to ack timeout, then send the client a kick message with that reason, in case it is somehow still listening.
2012-06-12 02:03:31 +01:00
6ccf746226
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-12 02:29:06 +02:00
24e8e5d818
*UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar code in SOP.cs
2012-06-12 01:26:03 +01:00
8c7149063b
In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
2012-06-12 01:25:09 +01:00
bab7dab4c5
Comment out the scene presence sitting debug log messages for now
2012-06-11 23:37:16 +01:00
51fe97a00c
Set CreateDefaultAvatarEntries = true in Robust.HG.ini.example to match Robust.HG.ini
...
Thanks to Ai Austin for the spot.
2012-06-11 23:33:32 +01:00
daad0a3e11
Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly."
...
This reverts commit a8a9d13dc0
2012-06-11 23:30:58 +01:00
a927787434
Add last frame time monitor to MonitorModule now that this value is useful
2012-06-11 23:30:11 +01:00
cbb5ddd944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-11 23:27:48 +01:00
124bf79658
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-12 00:17:18 +02:00
76a9885ad2
Merge branch 'master' into careminster
2012-06-11 23:15:38 +01:00
cd49949478
change object drag so it applies a impulse and not a push force so it works as before my fix to impulse/forces
2012-06-11 22:43:35 +01:00
0e045ea3d5
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-11 19:45:15 +01:00
d151b334fa
Merge branch 'avination' into ubitwork
2012-06-11 19:39:00 +01:00
84377a23db
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
2012-06-11 16:56:40 +01:00
82753d8673
Merge branch 'master' into careminster
2012-06-11 16:47:46 +01:00
71ba85137f
Commitig the Avination implementation of llTeleportAgent and
...
llTeleportAgentGlobalCoords. These do NOT use PERMISSION_TELEPORT like
their SL counterparts because that permission is not yet understood by TPVs
based on v1.x.
2012-06-11 16:45:52 +01:00
8c91e761c8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-09 16:28:22 +01:00
a8a9d13dc0
Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly.
...
Addresses http://opensimulator.org/mantis/view.php?id=3268
2012-06-09 05:11:08 +01:00
1f3218e53f
Create avatar entries necessary to stop new v3 avatars being clouds (pants, shape, etc.) by default in grid mode.
...
This only affects avatars created through the "create user" console command or createuser XMLRPC.
This matches the default setting for standalone
2012-06-09 01:11:15 +01:00
08cd5d2503
Add documentation to AllowGodFunctions setting in [LL-Functions]
2012-06-09 00:33:17 +01:00
817f2d341d
Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and json stats from working
2012-06-08 23:36:53 +01:00
853449d5bc
Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGlobalCoords()
2012-06-08 23:37:25 +02:00
efff5a7c0d
Fix a corner case where checking for region corssing may cross an avatar back if
...
it's pending to be sat onto a vehicle that is in the process of crossing.
2012-06-08 18:25:36 +02:00
2992fc0e72
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-08 16:55:03 +02:00
1eee525c88
Revert "Add a frame based watchdog function to keyframed motion"
...
This reverts commit 2d98d6354c
2012-06-08 16:54:47 +02:00
22437af26a
*UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending position change on others; don't assume m_host is in same grp that part (possible always is)...
2012-06-08 15:48:46 +01:00
f0a6ec151a
*UNTESTED* let SetPrimParams for avatars parse even unsupported parameters so that if a supported one is in the middle of then it still works.
2012-06-08 15:27:21 +01:00
9d878591c8
*UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for avatars. Stopped setting position twice in normal SetPrimParams
2012-06-08 14:29:02 +01:00
21c3cf3dc3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-08 15:16:20 +02:00
dadac6816b
Merge branch 'ubitwork' into avination
2012-06-08 15:15:17 +02:00
2d98d6354c
Add a frame based watchdog function to keyframed motion
2012-06-08 15:14:38 +02:00
e7731961a8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-08 14:55:17 +02:00
794d184c25
Stop sending a DisableSimulator packet in LLClientView.Close(), which is a duplicate for child agents and unnecessary for root agents.
...
Close() already calls Scene.RemoveClient() which sends the right eq or udp DisableSimulator message to child agents.
2012-06-08 04:32:51 +01:00
f94b92df46
Instead of retrieving the known client again in LLUDPServer.RemoveClient(), check the IsLoggingOut flag instead.
...
This is slightly better thread-race wise
2012-06-08 04:12:22 +01:00
c215b1ad16
If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop.
...
This is the same async behaviour as normal logouts.
This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages.
2012-06-08 03:53:03 +01:00
5f4f9f0230
Add regression test for client logout due to ack timeout.
2012-06-08 03:12:23 +01:00
22906386b4
Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.
2012-06-08 03:25:51 +02:00
d73805d7f4
Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet nor client are ever null.
2012-06-08 01:51:28 +01:00
d71c6dea7e
Store already retrieve IClientAPI in IncomingPacket structure for later use rather than doing another retrieve on dequeue.
...
Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state.
2012-06-08 01:43:58 +01:00
30f4a33f01
Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTeleport() if an agent needs closing.
...
This is always done as part of Scene.RemoveClient()
Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
2012-06-08 01:26:43 +01:00
8ebe2cd3da
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 01:12:37 +01:00
5c162ccd57
Go back to calling IncomingCloseAgent() in the "kick user" command for consistency instead of IClientAPI.Close() directly.
...
This no longer double counts child agent removals
2012-06-08 00:59:39 +01:00
48add77a4c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 00:43:39 +01:00
d547bcf8d1
Remove duplicate update of user count in Scene.IncomingCloseAgent()
...
This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
2012-06-08 00:40:38 +01:00
af2954898e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-08 00:24:39 +01:00
b56673c920
Fix bug with "kick user" reducing agent counts by 2 instead of 1.
...
This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
2012-06-08 00:18:25 +01:00
c5af3e384c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2012-06-08 00:14:39 +01:00
UbitUmarov