aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-152-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
| | | * | | | | | minor: Tell user the current debug http level if "debug http" console ↵Justin Clark-Casey (justincc)2012-06-151-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command is executed without a level parameter
| | | * | | | | | When setting debug http level, do this for all known http servers, not just ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the main instance.
| | | * | | | | | Make XMLRPCModule use an existing HTTP server if one already exists on the ↵Justin Clark-Casey (justincc)2012-06-151-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | desired port.
| | | * | | | | | Get rid of some unnecessary null checks in ↵Justin Clark-Casey (justincc)2012-06-151-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RegionApplicationBase.StartupSpecific() - a constructor can never return null. Also adds some method doc to MainServer
| | | * | | | | | minor: Extend 'debug http' usage statement to 0..3 from 0..2Justin Clark-Casey (justincc)2012-06-141-1/+1
| | | | | | | | |
| | | * | | | | | Shuffle "debug http" levels so that 1 and 2 now cause different levels of ↵Justin Clark-Casey (justincc)2012-06-141-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warn to be logged if we receive invalid xml for xmlrpc.
| | * | | | | | | Merge branch 'master' into careminsterMelanie2012-06-151-0/+14
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| | | * | | | | | Fix very recent regression in 917d753 where I put the ++updatesThisCall ↵Justin Clark-Casey (justincc)2012-06-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outside the batching part of ProcessEntityUpdates() This stopped any batching happening and since this method is called periodically updates were sent very slowly
| | | * | | | | | If we're going to discard a terse update block because it's now someone ↵Justin Clark-Casey (justincc)2012-06-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | else's hud, then don't still add it to the list of blocks for the update message.
| | | * | | | | | correct wrong incomplete comment from previous commit 3c3ea19 in ↵Justin Clark-Casey (justincc)2012-06-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AttachmentsModule
| | | * | | | | | Fix a bug where scene objects attached as HUDs through scripts would not ↵Justin Clark-Casey (justincc)2012-06-141-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disappear for other avatars. We do this by sending a kill message for that object to all other avatars apart from the one that has the hud.
| | | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-141-4/+29
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-141-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up the sound pipeline in the viewer.
| | | * | | | | | | Fix a race condition where an object update for a hud could be sent to ↵Justin Clark-Casey (justincc)2012-06-141-3/+24
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-owner avatars if the hud was attached directly from within the region. If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that. This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud.
| | * | | | | | | Merge branch 'master' into careminsterMelanie2012-06-144-8/+21
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵Justin Clark-Casey (justincc)2012-06-143-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | point. HUDs attachment points are private. Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations. This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs. It appears this is no longer true with Neck and Root (Avatar Center)
| | | * | | | | | minor: remove unnecessary IsAttachment = false setting for new object in ↵Justin Clark-Casey (justincc)2012-06-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadObjectAssetModule, property always starts as false
| | * | | | | | | Merge branch 'master' into careminsterMelanie2012-06-145-18/+11
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | | * | | | | | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove ↵Justin Clark-Casey (justincc)2012-06-131-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | duplicate code
| | | * | | | | | Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-133-13/+0
| | | | | | | | |
| | | * | | | | | Add ObjectUpdate as one of the packets that can be screened out when setting ↵Justin Clark-Casey (justincc)2012-06-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug packet level
| | | * | | | | | In the osGetGrid functions, if the [GridInfo] section does not exist then ↵Justin Clark-Casey (justincc)2012-06-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return "Configuration Error", as already happens if there is no GridInfoURI
| | | * | | | | | Committing the Avination implementation of llCastRay. This is a complete rewriteMelanie2012-06-131-100/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wich does it's thing independently of physics. Enjoy!
| | * | | | | | | Merge branch 'master' into careminsterMelanie2012-06-131-1/+6
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
| | | * | | | | | Add variable timer configureation for the timer_ScriptBlueWall2012-06-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "timer_Interval" to the OpenSimDefaults.ini, leaving the default value set to 1200, as the previous default setting. The value represents seconds. To change the default, copy the entry to OpenSim.ini and multiply the number of minutes for the interval by 60.
| | * | | | | | | Merge branch 'master' into careminsterMelanie2012-06-127-71/+70
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | | * | | | | | Remove accidental timeout left in during earlier debugging. Has been in ↵Justin Clark-Casey (justincc)2012-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since two commits ago (b099f26)
| | | * | | | | | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent ↵Justin Clark-Casey (justincc)2012-06-124-49/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than scanning all scene for the presence with the right id Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions. This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
| | | * | | | | | Set IClientAPI.IsActive = false early on client removal due to ack timeout ↵Justin Clark-Casey (justincc)2012-06-121-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | | * | | | | | If the simulator closes a root agent due to ack timeout, then send the ↵Justin Clark-Casey (justincc)2012-06-121-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client a kick message with that reason, in case it is somehow still listening.
| | | * | | | | | In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already ↵Justin Clark-Casey (justincc)2012-06-123-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
| | * | | | | | | Merge branch 'master' into careminsterMelanie2012-06-112-6/+14
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Comment out the scene presence sitting debug log messages for nowJustin Clark-Casey (justincc)2012-06-111-6/+6
| | | | | | | | |
| | | * | | | | | Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in ↵Justin Clark-Casey (justincc)2012-06-111-3956/+3978
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LSL where these aren't evaluated propertly." This reverts commit a8a9d13dc07bc9e23ebf439cbea5ece6ae002315. Accidentally committed, this patch might not be the correct approach.
| | | * | | | | | Add last frame time monitor to MonitorModule now that this value is usefulJustin Clark-Casey (justincc)2012-06-111-0/+8
| | | | | | | | |
| | | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-113-0/+106
| | | |\ \ \ \ \ \
| | | | * | | | | | Commitig the Avination implementation of llTeleportAgent andMelanie2012-06-113-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llTeleportAgentGlobalCoords. These do NOT use PERMISSION_TELEPORT like their SL counterparts because that permission is not yet understood by TPVs based on v1.x.
| | | * | | | | | | Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL ↵Justin Clark-Casey (justincc)2012-06-091-3978/+3956
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where these aren't evaluated propertly. Addresses http://opensimulator.org/mantis/view.php?id=3268
| | * | | | | | | Merge branch 'avination' into careminsterMelanie2012-06-117-9/+86
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-095-134/+134
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | | * | | | | | | Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and ↵Justin Clark-Casey (justincc)2012-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | json stats from working
| | | * | | | | | | Stop sending a DisableSimulator packet in LLClientView.Close(), which is a ↵Justin Clark-Casey (justincc)2012-06-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | | | | Instead of retrieving the known client again in LLUDPServer.RemoveClient(), ↵Justin Clark-Casey (justincc)2012-06-081-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check the IsLoggingOut flag instead. This is slightly better thread-race wise
| | | * | | | | | | If logging a client out due to ack timeout, do this asynchronously rather ↵Justin Clark-Casey (justincc)2012-06-082-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | | | | Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-084-93/+103
| | | | | | | | | |
| | | * | | | | | | Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet ↵Justin Clark-Casey (justincc)2012-06-081-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nor client are ever null.
| | | * | | | | | | Store already retrieve IClientAPI in IncomingPacket structure for later use ↵Justin Clark-Casey (justincc)2012-06-082-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | Merge branch 'master' into careminsterMelanie2012-06-084-84/+75
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | | * | | | | | | Don't make duplicate call to ScenePresence.Close() separately in ↵Justin Clark-Casey (justincc)2012-06-084-82/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.1 at 2024-12-24 20:58:36 +0000