aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-1210-98/+97
|\ | | | | | | | | | | 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-126-70/+43
| | | | | | | | | | | | | | 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-122-35/+38
| | | | | | | | | | | | | | | | 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-124-24/+22
| | | | | | | | 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-1113-11/+149
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Make llTeleportAgent conform to Magnum SL Server and add ↵Melanie2012-06-083-5/+73
| | | | | | | | | | | | llTeleportAgentGlobalCoords()
| * | Fix a corner case where checking for region corssing may cross an avatar back ifMelanie2012-06-081-2/+7
| | | | | | | | | | | | it's pending to be sat onto a vehicle that is in the process of crossing.
| * | Revert "Add a frame based watchdog function to keyframed motion"Melanie2012-06-081-20/+0
| | | | | | | | | | | | This reverts commit 2d98d6354ce04b655e8d9062a209f5af1565c78c.
| * | Merge branch 'ubitwork' into avinationMelanie2012-06-081-0/+20
| |\ \
| | * | Add a frame based watchdog function to keyframed motionMelanie2012-06-081-0/+20
| | | |
| * | | Cut off collision sounds with avatar at 3.2. This makes most walkig collisionsMelanie2012-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | with walls and stairs silent. Falls from greater height and running into things will still be heard. a CollisionSound defined for the object will override this so one can still script a soccer ball with sounds.
| * | | Further limit the amount of avatar collisions that will actually triggerMelanie2012-06-071-2/+4
| | | | | | | | | | | | | | | | sounds. They are distracting.
| * | | Typo fixMelanie2012-06-071-3/+5
| | | |
| * | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-078-0/+63
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-06-097-149/+139
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | 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-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
| * | | 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-078-122/+112
|\ \ \ \ | | |/ / | |/| |
| * | | Implement playing of the real collision sounds, change scaling for avatarMelanie2012-06-071-133/+57
| | | | | | | | | | | | | | | | | | | | collisions to make them really soft because otherwise climbing stairs makes an unbearable amount of noise.
| * | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-071-4/+29
| | | | | | | | | | | | | | | | up the sound pipeline in the viewer.
| * | | Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| | | | | | | | | | | | | | | | is not listening to at_target
| * | | Typo correctionMelanie2012-06-071-1/+1
| | | |
| * | | Disable default collision sounds until they can be uploaded, but enable ↵Melanie2012-06-071-55/+56
| | | | | | | | | | | | | | | | custom ones
| * | | Set collision sound type so custom sound types are recognizedMelanie2012-06-071-0/+2
| | | |
| * | | Make the "delay restart" button delay restart for 1 hour rather than abortingMelanie2012-06-073-31/+61
| | | | | | | | | | | | | | | | it altogether. Allow a maximum of three uses before the restart goes through.
| * | | Make timed bans / timed passes work as expected. Prevent transmission of mediaMelanie2012-06-072-2/+34
| | | | | | | | | | | | | | | | URLs to banned clients.
| * | | Prevent a null ref when getting the velocity of an avatar during login orMelanie2012-06-071-2/+3
| | |/ | |/| | | | | | | logout.
* | | Merge branch 'master' into careminsterMelanie2012-06-079-75/+149
|\ \ \ | | |/ | |/| | | | | | | 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.
generated by cgit v1.1 at 2024-10-21 01:57:37 +0000