aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | If logging a client out due to ack timeout, do this asynchronously rather ↵Justin Clark-Casey (justincc)2012-06-083-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-085-108/+105
| | | | | | | | | |
| | | * | | | | | | 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.
| | * | | | | | | | Merge branch 'master' into careminsterMelanie2012-06-084-17/+24
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | | * | | | | | | Go back to calling IncomingCloseAgent() in the "kick user" command for ↵Justin Clark-Casey (justincc)2012-06-082-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistency instead of IClientAPI.Close() directly. This no longer double counts child agent removals
| | | * | | | | | | Remove duplicate update of user count in Scene.IncomingCloseAgent()Justin Clark-Casey (justincc)2012-06-083-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
| | * | | | | | | | Merge branch 'master' into careminsterMelanie2012-06-084-25/+25
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| | | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-0859-0/+355
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| | | | | | | | | | |
| | | * | | | | | | | Fix bug with "kick user" reducing agent counts by 2 instead of 1.Justin Clark-Casey (justincc)2012-06-083-22/+24
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()
| | * | | | | | | | Merge branch 'avination' into careminsterMelanie2012-06-0767-122/+467
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-0710-75/+150
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| | | * | | | | | | | Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-074-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change code to grab the agent asset transaction module once.
| | | * | | | | | | | Don't send kill object messages to clients when a child agent is closed.Justin Clark-Casey (justincc)2012-06-071-18/+21
| | | | | | | | | | |
| | | * | | | | | | | Mantis 6044 Building master currently fails.Talun2012-06-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing reference to System.Core Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | | * | | | | | | | Make change to fix Windows buildsBlueWall2012-06-071-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Log warning if we try to remove a UDP client that has already been removed.Justin Clark-Casey (justincc)2012-06-071-0/+6
| | | | | | | | | | |
| | | * | | | | | | | Allow the thread watchdog to accept an alarm method that is invoked if the ↵Justin Clark-Casey (justincc)2012-06-074-25/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | | Remove a null ref when an avatar's attachment gets the avatar velocityMelanie2012-06-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while the avatar is logging in or out. Also remove some unlocking calls without matching locking call. Merge artefact cleanup, again.
| | * | | | | | | | | Remove useless logging of a bare-names stack trace. It's meaninglessMelanie2012-06-061-32/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a non-programmer and insufficient for a programmer. Add commented debug output and data collection to troubleshoot future locking issues.
| | * | | | | | | | | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
| | | | | | | | | | |
| | * | | | | | | | | Reverse the logic of a conditional. Clears up a merge artefact.Melanie2012-06-061-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-061-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up the sound pipeline in the viewer.
| | * | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-06-069-35/+87
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-0617-441/+523
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| | | * | | | | | | | | minor: Change log messages on Warp3DImageModule to show they are from this ↵Justin Clark-Casey (justincc)2012-06-061-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | module
| | | * | | | | | | | | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class ↵Justin Clark-Casey (justincc)2012-06-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name and make it easier to distinguish between map image modules.
| | | * | | | | | | | | Actively dispose of Bitmaps in Warp3D image module and world map module once ↵Justin Clark-Casey (justincc)2012-06-063-215/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we've finished with them. This might help with memory leakage issues though I suspect it won't.
| | | * | | | | | | | | enabling all corners of a sim to be set in one callSignpostMarv2012-06-061-1/+11
| | | | | | | | | | | |
| | | * | | | | | | | | Ensure closure of bitmap and memory stream with using() statements in ↵Justin Clark-Casey (justincc)2012-06-061-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorldViewModule. If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default)
| | | * | | | | | | | | Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen ↵Justin Clark-Casey (justincc)2012-06-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file when loaded from a stream. Fixes a bug introduced 2 weeks ago in 67ebe80 Thanks to Plugh for pointing this out.
| | | * | | | | | | | | minor: Add user feedback when executing fix-phantomsJustin Clark-Casey (justincc)2012-06-051-0/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Allow fix-phantoms command to appear even if CombineContiguousRegions = ↵Justin Clark-Casey (justincc)2012-06-051-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | false, since this allows one to go back from a megaregion to normal regions. Adapted from a patch by Garmin Kawaguichi in http://opensimulator.org/mantis/view.php?id=6027 Garmin says that fix-phantoms allows one to reset objects when going back from megaregion to normal regions as well as the othe rway around. Thanks!
| | | * | | | | | | | | Mantis 4597 AgentPaused packet is ignored.Talun2012-06-052-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | | | | | | Remove unused ScenePresence list structure in llGetAgentList()Justin Clark-Casey (justincc)2012-06-051-1/+0
| | | | | | | | | | | |
| | | * | | | | | | | | Scale down per frame MS stats to match scaled simulator FPS stat.Justin Clark-Casey (justincc)2012-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes frame time stats properly tally with fps, which saves confusion and makes it easier to interpret numbers. In some ways this is not so artifical - physics FPS runs at the higher rate.
| | | * | | | | | | | | Start sending spare frame time MS viewer stat. Make frame time correctly ↵Justin Clark-Casey (justincc)2012-06-052-78/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display total frame time, not just non-spare time. This makes it easier to see when components of frame time exceed normal permitted frame time. Currently reflect scene frame times.
| | | * | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-055-44/+50
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add replaceable region modules to the "show modules" commandBlueWall2012-06-041-29/+49
| | | | | | | | | | | | |
| | | | * | | | | | | | | Remove profile from basic configurationMelanie2012-06-042-6/+0
| | | | | | | | | | | | |
| | | | * | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-06-041-1/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Correct the delegate specification in EventManager.TriggerTerrainTainted. ↵Robert Adams2012-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the wrong one was cut and pasted.
| | | | * | | | | | | | | | Remove the "Profile" config as it's covered by the replaceable interfaceMelanie2012-06-041-8/+0
| | | | |/ / / / / / / / /
| | | * | | | | | | | | | Properly show per frame millisecond statistics per frame, not as amount of ↵Justin Clark-Casey (justincc)2012-06-041-22/+41
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time taken per second. This is to make these statistics actually match their names (and also be more accurate as number of frames can vary under heavy load) Currently using scene frames (11.23 every second) instead of physics frames (56.18 per second)
| | * | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-06-034-78/+83
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Fix build break whree accidentally did inv.Folders rather than ↵Justin Clark-Casey (justincc)2012-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inv.Folders.Count in a minor change.
| | | * | | | | | | | | minor: tidy up some commentsJustin Clark-Casey (justincc)2012-06-021-4/+2
| | | | | | | | | | | |
generated by cgit v1.1 at 2025-03-15 05:36:27 +0000