aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* minor: remove mono compiler warning from AttachmentsModuleJustin Clark-Casey (justincc)2013-08-171-2/+1
|
* Remove some mono compiler warnings from OpenSim/Server/HandlersJustin Clark-Casey (justincc)2013-08-173-10/+4
|
* minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGridJustin Clark-Casey (justincc)2013-08-172-9/+2
|
* minor: remove mono compiler warnings from ScenePresenceJustin Clark-Casey (justincc)2013-08-171-4/+3
|
* remove mono compiler warnings from PollServiceRequestManagerJustin Clark-Casey (justincc)2013-08-171-4/+2
|
* minor: remove mono compiler warning in StatsManagerJustin Clark-Casey (justincc)2013-08-171-1/+1
|
* minor: Make log messages consistent in NeighbourServicesConnectorJustin Clark-Casey (justincc)2013-08-171-6/+6
|
* Fix issues with RemoteAdmin admin_save_heightmap and admin_load_heightmap ↵Justin Clark-Casey (justincc)2013-08-171-15/+30
| | | | | | | | | not working. This is because they were wrongly looking for both regionid and region_id parameters in the same request. Now only region_id is required (and recognized), regionid having been already deprecated for some time. This is essentially Michelle Argus' patch from http://opensimulator.org/mantis/view.php?id=6737 but with tabs replaced with spaces. Thanks!
* Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() ↵Justin Clark-Casey (justincc)2013-08-175-10/+109
| | | | | | regression test for v2 transfers. Also adjusts names of teleport setup helpers in EntityTransferHelpers
* Add TestSameSimulatorNeighbouringRegionsV2() regression test for v2 entity ↵Justin Clark-Casey (justincc)2013-08-161-2/+87
| | | | transfer protocl
* refactor: Make ↵Justin Clark-Casey (justincc)2013-08-161-1/+1
| | | | AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use already available TestClient handle rather than retrieving it via the ScenePresence
* Packet headers are not zero-encoded so don't try to zero-decode these in ↵Justin Clark-Casey (justincc)2013-08-161-16/+9
| | | | | | | | PacketPool.GetType() Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211) Thanks to lkalif for pointing this out.
* Try to make "slow down" message that one could receive on rapid teleporting ↵Justin Clark-Casey (justincc)2013-08-151-1/+2
| | | | | | | | more informative to the user. This message is seen on V2 if one attempts to quickly re-teleport from a source region where one had previously teleported to a non-neighbour and back within 15 secs. The solution here is for the user to wait a short while. This message can also be seen on any teleport protocol if one recieves multiple teleport attempts simultaneously. Probably still useful here to help identify misbehaving scripts.
* Move DoNotCloseAfterTeleport flag reset before UpdateAgent in V2 to avoid a ↵Justin Clark-Casey (justincc)2013-08-151-2/+6
| | | | low probability where the destination re-establishing the child connection before the flag was reset
* Rely on the Scene.IncomingCloseAgent() check as to whether the connection ↵Justin Clark-Casey (justincc)2013-08-152-15/+7
| | | | | | should be kept open after teleport-end rather than doing this in the ET Module This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
* Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.Justin Clark-Casey (justincc)2013-08-152-23/+32
| | | | | | | This approach has problems if a client quits without sending a proper logout but then reconnects before the connection is closed due to inactivity. In this case, the DoNotCloseAfterTeleport was wrongly set. The simplest approach is to close child agents on teleport as quickly as possible so that races are very unlikely to occur Hence, this code now closes child agents as the first action after a sucessful teleport.
* Actually implement the bot request object textures switch started in 225cf0d.Justin Clark-Casey (justincc)2013-08-142-0/+9
| | | | Forgot to propogate it down to bot level.
* minor: Comment out AvatarPicketSearch caps log message for now, which is ↵Justin Clark-Casey (justincc)2013-08-141-1/+1
| | | | occuring on every login and entity transfer
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-145-6/+28
|\
| * BulletSim: include check for volume detect in check for zeroing avatar motion.Robert Adams2013-08-142-2/+6
| | | | | | | | | | | | | | Normally, avatar motion is zeroed if colliding with a stationary object so they don't slide down hills and such. Without volume detect check this also allowed avatars to stand on volume detect objects and to have some jiggling when they were in the volume detect object. This commit fixes both.
| * BulletSim: add physical object initialized flag so updates and collisionsRobert Adams2013-08-145-5/+23
| | | | | | | | | | | | | | | | | | don't happen until the object is completely initialized. This fixes the problem of doing a teleport while the simulator is running. The destruction of the physical object while the engine is running means that the physics parameter update would overwrite the new position of the newly created avatar.
* | minor: remove unused entity transfer config in teleport v2 attachments testJustin Clark-Casey (justincc)2013-08-141-1/+0
|/
* Add stat clientstack.<scene>.IncomingPacketsOrphanedCount to record ↵Justin Clark-Casey (justincc)2013-08-141-4/+29
| | | | well-formed packets that were not initial connection packets and could not be associated with a connected viewer.
* Count any incoming packet that could not be recognized as an LLUDP packet as ↵Justin Clark-Casey (justincc)2013-08-141-21/+44
| | | | | | | a malformed packet. Record this as stat clientstack.<scene>.IncomingPacketsMalformedCount Used to detect if a simulator is receiving significant junk UDP Decimates the number of packets between which a warning is logged and prints the IP source of the last malformed packet when logging
* If pCampbot has been asked to shutdown, don't carry on logging in queued botsJustin Clark-Casey (justincc)2013-08-141-1/+11
|
* Add pCampbot RequestObjectTextures ini setting to control whether textures ↵Justin Clark-Casey (justincc)2013-08-143-2/+17
| | | | are requested for received objects.
* Add method doc to Scene.RemoveClient() to ask any callers to use ↵Justin Clark-Casey (justincc)2013-08-142-0/+25
| | | | | | | | Scene.IncomingCloseAgent() instead. IncomingCloseAgent() now sets the scene presence state machine properly, which is necessary to avoid races between multiple sources of close. Hence, it's also necessary for everyone to consistently call IncomingCloseAgent() Calling RemoveClient() directly is currently generating an attention-grabbing exception though this right now this is harmless.
* Shutdown a bot's actions by making it check for disconnecting state rather ↵Justin Clark-Casey (justincc)2013-08-141-3/+3
| | | | | | than aborting the thread. Aborting the thread appears to be causing shutdown issues.
* Add a -form switch to pCampbot to allow one to login a sequence of bots ↵Justin Clark-Casey (justincc)2013-08-142-4/+8
| | | | starting from numbers other than 0
* Add the ability to explicitly specify a login start location to pCampbot via ↵Justin Clark-Casey (justincc)2013-08-143-27/+76
| | | | the -start parameter
* BulletSim: move the creation of the avatar movement actor creating toRobert Adams2013-08-131-7/+7
| | | | | | taint time. Attempt to fix a problem of teleporting within the same region where the remove and addition of the physical avatar occasionally ends up with a non-moving avatar.
* Add a SendAgentUpdates setting to a new pCampbot.ini.example file which can ↵Justin Clark-Casey (justincc)2013-08-134-40/+59
| | | | | | control whether bots send agent updates pCampbot.ini.example is used by copying to pCampbot.ini, like other ini files
* minor: Eliminate one of the duplicate 'have's in the HG message telling the ↵Justin Clark-Casey (justincc)2013-08-131-1/+1
| | | | user if no GroupsServerURI has been given in user data by the home grid
* Remove exception when printing error for failure removing script state.Robert Adams2013-08-131-1/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-124-13/+26
|\
| * BulletSim: add check in avatar stair step code to verify the collisionRobert Adams2013-08-124-13/+26
| | | | | | | | | | | | | | | | is not with a volume detect object. This fixes a problem of avatars trying to step over a volume detect object that they collide with. This appeared as the avatar popping up as it started to step up but then continuing on since the object wasn't physically interacting.
* | Make show bots pCampbot console command print connected, connecting, etc. ↵Justin Clark-Casey (justincc)2013-08-121-0/+13
|/ | | | bot totals at end.
* Don't try and send group updates to NPCs via event queue, since NPCs have no ↵Justin Clark-Casey (justincc)2013-08-122-4/+7
| | | | | | | event queue. I think there is an argument for sending this information to NPCs anyway since in some cases it appears a lot easier to write server-side bots by hooking into such internal events. However, would need to stop event messages building up on NPC queues if they are never retrieved.
* minor: Extend warning message when adding trying to add an event for a ↵Justin Clark-Casey (justincc)2013-08-121-3/+8
| | | | client without a queue to include the event message name.
* Get rid of issue where removing NPCs would through an exception by routing ↵Justin Clark-Casey (justincc)2013-08-121-1/+3
| | | | | | close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather than directly to Scene.RemoveClient(). This exception was actually harmless since it occurred at the very last stage of the remove client process.
* Add none behaviour to pCampbot when one wants bots to just stand aroundJustin Clark-Casey (justincc)2013-08-123-10/+57
|
* Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for ↵Justin Clark-Casey (justincc)2013-08-122-9/+130
| | | | V2 transfer protocol.
* Stats treaking. Update ToOSDMap for Stat and PercentageStat to returnRobert Adams2013-08-104-150/+235
| | | | | all the various numbers that have been added to the console output. Break out EventHistogram from CounterStat.
* minor: Consistently log IOCP for IO completion thread startup log ↵Justin Clark-Casey (justincc)2013-08-091-3/+3
| | | | information instead of mixing this with "IO Completion Threads"
* Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4.Justin Clark-Casey (justincc)2013-08-091-1/+1
| | | | | | This is giving much better results on teleports between simulators over my lan where for some reason there is a pause before the receiving simulator processes UpdateAgent() At this point, v2 teleports between neighbour and non-neighbour regions on a single simulator and between v2 simulators and between a v1 and v2 simulator are working okay for me in different scenarios (e.g. simple teleport, teleport back to original quickly and re-teleport, teleport back to neighbour and re-teleport. etc.)
* Add missing file from b1c26a56Justin Clark-Casey (justincc)2013-08-091-0/+102
|
* Merge branch 'TeleportWork'Justin Clark-Casey (justincc)2013-08-098-134/+268
|\
| * Comment back out seed dump code enabled in b1c26a56. Also adds a few ↵Justin Clark-Casey (justincc)2013-08-091-16/+22
| | | | | | | | teleport comments.
| * Fix an issue with an A->C->B->A teleport where these regions are in a row ↵Justin Clark-Casey (justincc)2013-08-091-0/+8
| | | | | | | | | | | | | | (A,B,C) where the A root agent is still closed, terminating the connection. This was occuring because teleport to B did not set DoNotCloseAfterTeleport on A as it was a neighbour (where it isn't set to avoid the issue where the source region doesn't send Close() to regions that are still neighbours (hence not resetting DoNotCloseAfterTeleport). Fix here is to still set DoNotCloseAfterTeleport if scene presence is still registered as in transit from A
| * Fix an issue where under teleport v2 protocol, teleporting from regions in ↵Justin Clark-Casey (justincc)2013-08-088-147/+267
| | | | | | | | | | | | | | | | | | | | an line from A->B->C would not close region A when reaching C The root cause was that v2 was only closing neighbour agents if the root connection also needed a close. However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection. This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports). Also, has not been completely tested yet in scenarios where regions are running on different simulators