| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-06-11 | 2 | -6/+14 |
| |\ | |||||
| | * | Comment out the scene presence sitting debug log messages for now | Justin Clark-Casey (justincc) | 2012-06-11 | 1 | -6/+6 |
| | | | |||||
| | * | Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in ↵ | Justin Clark-Casey (justincc) | 2012-06-11 | 1 | -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 useful | Justin Clark-Casey (justincc) | 2012-06-11 | 1 | -0/+8 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-06-11 | 3 | -0/+106 |
| | |\ | |||||
| | | * | Commitig the Avination implementation of llTeleportAgent and | Melanie | 2012-06-11 | 3 | -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-09 | 1 | -3978/+3956 |
| | |/ | | | | | | | | | | | where these aren't evaluated propertly. Addresses http://opensimulator.org/mantis/view.php?id=3268 | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-06-11 | 7 | -9/+86 |
| |\ \ | | | | | | | | | | | | | | | | | | | 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 ↵ | Melanie | 2012-06-08 | 3 | -5/+73 |
| | | | | | | | | | | | | | llTeleportAgentGlobalCoords() | ||||
| | * | | Fix a corner case where checking for region corssing may cross an avatar back if | Melanie | 2012-06-08 | 1 | -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" | Melanie | 2012-06-08 | 1 | -20/+0 |
| | | | | | | | | | | | | | This reverts commit 2d98d6354ce04b655e8d9062a209f5af1565c78c. | ||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-06-08 | 1 | -0/+20 |
| | |\ \ | |||||
| | | * | | Add a frame based watchdog function to keyframed motion | Melanie | 2012-06-08 | 1 | -0/+20 |
| | | | | | |||||
| | * | | | Cut off collision sounds with avatar at 3.2. This makes most walkig collisions | Melanie | 2012-06-08 | 1 | -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 trigger | Melanie | 2012-06-07 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | sounds. They are distracting. | ||||
| | * | | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDs | Melanie | 2012-06-07 | 2 | -0/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-06-09 | 5 | -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-08 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | json stats from working | ||||
| | * | | | 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 | 4 | -93/+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-08 | 4 | -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-08 | 4 | -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 careminster | Melanie | 2012-06-08 | 4 | -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-08 | 2 | -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-08 | 3 | -14/+27 |
| | | | | | | | | | | | | | | | | | This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-06-08 | 4 | -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-08 | 3 | -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 careminster | Melanie | 2012-06-07 | 8 | -122/+112 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Implement playing of the real collision sounds, change scaling for avatar | Melanie | 2012-06-07 | 1 | -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 clogs | Melanie | 2012-06-07 | 1 | -4/+29 |
| | | | | | | | | | | | | | | | | | up the sound pipeline in the viewer. | ||||
| | * | | | Make not_at_target stop when the target is reached even if the script | Melanie | 2012-06-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | is not listening to at_target | ||||
| | * | | | Typo correction | Melanie | 2012-06-07 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Disable default collision sounds until they can be uploaded, but enable ↵ | Melanie | 2012-06-07 | 1 | -55/+56 |
| | | | | | | | | | | | | | | | | | custom ones | ||||
| | * | | | Set collision sound type so custom sound types are recognized | Melanie | 2012-06-07 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Make the "delay restart" button delay restart for 1 hour rather than aborting | Melanie | 2012-06-07 | 3 | -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 media | Melanie | 2012-06-07 | 2 | -2/+34 |
| | | | | | | | | | | | | | | | | | URLs to banned clients. | ||||
| | * | | | Prevent a null ref when getting the velocity of an avatar during login or | Melanie | 2012-06-07 | 1 | -2/+3 |
| | | |/ | |/| | | | | | | | logout. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-07 | 6 | -57/+123 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | | Record the fact that child agents can have asset transactions. | Justin Clark-Casey (justincc) | 2012-06-07 | 4 | -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-07 | 1 | -18/+21 |
| | | | | |||||
| | * | | 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 | 2 | -8/+71 |
| | | | | | | | | | | | | | | | | | | | | | | 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 velocity | Melanie | 2012-06-06 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | while the avatar is logging in or out. Also remove some unlocking calls without matching locking call. Merge artefact cleanup, again. | ||||
| * | | | Remove two causes of recursive locking. Merge artefact cleanup. | Melanie | 2012-06-06 | 1 | -7/+5 |
| | | | | |||||
| * | | | Reverse the logic of a conditional. Clears up a merge artefact. | Melanie | 2012-06-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |