| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 2 | -5/+5 |
| |\ | |||||
| | * | Add region name to UseCircuitCode log messages | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -4/+4 |
| | | | |||||
| | * | Put all debug console commands into a single Debug section rather than ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -1/+1 |
| | | | | | | | | | scattering them over other categories | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 2 | -10/+16 |
| |\ \ | |/ | |||||
| | * | Add main instance to internal MainServer.m_Servers list to simplify internal ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 2 | -1/+11 |
| | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance | ||||
| | * | Get rid of some unnecessary null checks in ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -9/+5 |
| | | | | | | | | | | | | | RegionApplicationBase.StartupSpecific() - a constructor can never return null. Also adds some method doc to MainServer | ||||
| | * | Fix very recent regression in 917d753 where I put the ++updatesThisCall ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -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-14 | 1 | -2/+4 |
| | | | | | | | | | else's hud, then don't still add it to the list of blocks for the update message. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -4/+29 |
| | |\ | |||||
| | | * | Fix not sending TransferInfo when an asset is not found. This clogs | Melanie | 2012-06-14 | 1 | -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-14 | 1 | -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 careminster | Melanie | 2012-06-14 | 1 | -1/+0 |
| |\ \ | |/ | |||||
| | * | minor: remove unnecessary IsAttachment = false setting for new object in ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+0 |
| | | | | | | | | | UploadObjectAssetModule, property always starts as false | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 1 | -6/+3 |
| |\ \ | |/ | | | | | | | | | 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-13 | 1 | -5/+7 |
| | | | | | | | | | duplicate code | ||||
| | * | Remove long obsolete and unused IClientAPI.KillEndDone() | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -4/+0 |
| | | | |||||
| | * | Add ObjectUpdate as one of the packets that can be screened out when setting ↵ | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -1/+2 |
| | | | | | | | | | debug packet level | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-06-12 | 2 | -7/+38 |
| |\ \ | |/ | | | | | | | | | 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-12 | 1 | -1/+1 |
| | | | | | | | | | since two commits ago (b099f26) | ||||
| | * | Set IClientAPI.IsActive = false early on client removal due to ack timeout ↵ | Justin Clark-Casey (justincc) | 2012-06-12 | 1 | -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-12 | 1 | -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-12 | 1 | -2/+2 |
| | | | | | | | | | available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-06-09 | 4 | -133/+133 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| | * | Stop sending a DisableSimulator packet in LLClientView.Close(), which is a ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 1 | -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-08 | 1 | -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-08 | 2 | -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-08 | 3 | -91/+103 |
| | | | |||||
| | * | Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 1 | -8/+1 |
| | | | | | | | | | nor client are ever null. | ||||
| | * | Store already retrieve IClientAPI in IncomingPacket structure for later use ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 2 | -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 careminster | Melanie | 2012-06-07 | 1 | -5/+70 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Log warning if we try to remove a UDP client that has already been removed. | Justin Clark-Casey (justincc) | 2012-06-07 | 1 | -0/+6 |
| | | | |||||
| | * | Allow the thread watchdog to accept an alarm method that is invoked if the ↵ | Justin Clark-Casey (justincc) | 2012-06-07 | 1 | -5/+64 |
| | | | | | | | | | | | | | | | timeout is breached. This alarm can then invoke this to log extra information. This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered. | ||||
| * | | Fix not sending TransferInfo when an asset is not found. This clogs | Melanie | 2012-06-06 | 1 | -4/+29 |
| | | | | | | | | | up the sound pipeline in the viewer. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-06-06 | 1 | -3/+15 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | ||||
| | * | Mantis 4597 AgentPaused packet is ignored. | Talun | 2012-06-05 | 1 | -3/+15 |
| | | | | | | | | | | | | | The packet was actually being handled but not acted on. This change extends the default timeout for paused clients to 5 minutes and makes both the paused and non-paused timeout periods configurable. | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-06-02 | 1 | -19/+19 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | Remove the kill record. Core has removed it long ago and it really does more ↵ | Melanie | 2012-06-01 | 1 | -19/+19 |
| | | | | | | | | | | | | | harm than good these days | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-31 | 1 | -18/+32 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Fix the log standing attach-from-world bug. | Melanie | 2012-05-30 | 1 | -18/+32 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-19 | 1 | -39/+61 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | ||||
| | * | | Fix build break. Comment out EQG deregister/register logging. | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -10/+10 |
| | | | | |||||
| | * | | Add level 2 debug eq logging which logs event queue polls. | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -23/+32 |
| | | | | | | | | | | | | | Refactor: eq message logging into common method. | ||||
| | * | | refactor: move EventQueueGet path generation into common method. Rename ↵ | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -20/+33 |
| | | | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-17 | 1 | -2/+8 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | udp transfer: make number packets estimation coerent with number actually ↵ | UbitUmarov | 2012-05-17 | 1 | -2/+8 |
| | | | | | | | | | | | | | sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100). | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 1 | -1/+21 |
| |\ \ \ | |/ / | |||||
| | * | | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵ | UbitUmarov | 2012-05-12 | 1 | -1/+21 |
| | | | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-10 | 2 | -6/+9 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Improve logging on the prim inventory script asset request path for future use. | Justin Clark-Casey (justincc) | 2012-05-09 | 2 | -6/+9 |
| | | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1 | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-08 | 1 | -4/+2 |
| |\ \ \ | | |/ | |/| | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |