aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-06-1120-16414/+18045
|\ | | | | | | | | | | | | 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
| | |
| * | Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.Melanie2012-06-087-16403/+17896
| | |
| * | 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-110-0/+0
|\ \ \
| * | | 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.
* | | | Merge branch 'master' into careminsterMelanie2012-06-099-150/+142
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | Create avatar entries necessary to stop new v3 avatars being clouds (pants, ↵Justin Clark-Casey (justincc)2012-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | shape, etc.) by default in grid mode. This only affects avatars created through the "create user" console command or createuser XMLRPC. This matches the default setting for standalone
| * | | Add documentation to AllowGodFunctions setting in [LL-Functions]Justin Clark-Casey (justincc)2012-06-091-0/+2
| | | |
| * | | 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
| * | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | 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.
| * | | Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| | | |
| * | | 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-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.
generated by cgit v1.1 at 2024-10-21 02:21:23 +0000