aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-111-6/+6
|\
| * Comment out the scene presence sitting debug log messages for nowJustin Clark-Casey (justincc)2012-06-111-6/+6
| |
* | Merge branch 'avination' into careminsterMelanie2012-06-114-4/+13
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | 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.
| * | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-072-0/+3
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-06-083-83/+75
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Don't make duplicate call to ScenePresence.Close() separately in ↵Justin Clark-Casey (justincc)2012-06-083-81/+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-083-16/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Go back to calling IncomingCloseAgent() in the "kick user" command for ↵Justin Clark-Casey (justincc)2012-06-081-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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-082-22/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 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-082-20/+22
| | | | | | | | | | | | | | | | | | | | 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-073-89/+16
|\ \ \ \ | | |/ / | |/| |
| * | | 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.
| * | | Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| | | | | | | | | | | | | | | | is not listening to at_target
| * | | Disable default collision sounds until they can be uploaded, but enable ↵Melanie2012-06-071-55/+56
| | | | | | | | | | | | | | | | custom ones
| * | | Make the "delay restart" button delay restart for 1 hour rather than abortingMelanie2012-06-071-0/+1
| | |/ | |/| | | | | | | it altogether. Allow a maximum of three uses before the restart goes through.
* | | Merge branch 'master' into careminsterMelanie2012-06-072-40/+38
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-072-23/+18
| | | | | | | | | | | | 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
| | |
* | | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-064-10/+19
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| | |
| * | Fix land collisions to work like SL.Melanie2012-06-051-6/+16
| | |
| * | Actually trigger land collisions in the root even when a child collidesMelanie2012-06-041-1/+1
| | |
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵Melanie2012-06-042-2/+2
| | | | | | | | | | | | positions.
* | | Merge branch 'master' into careminsterMelanie2012-06-063-151/+159
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | 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-051-1/+1
| |\ \
| | * | Correct the delegate specification in EventManager.TriggerTerrainTainted. ↵Robert Adams2012-06-041-1/+1
| | | | | | | | | | | | | | | | Looks like the wrong one was cut and pasted.
| * | | 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 'avination' into careminsterMelanie2012-06-021-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-011-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-06-022-33/+14
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Instead of updating sim stats root agent, child, objects and scripts ↵Justin Clark-Casey (justincc)2012-06-012-33/+14
| | | | | | | | | | | | accounts every single scene frame, update in the once every 3 seconds SimStatsReporter run
* | | Merge branch 'avination' into careminsterMelanie2012-05-312-163/+163
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add advanced collision processing into ScenePresenceMelanie2012-05-291-162/+162
| | |
| * | Fix collision filteringMelanie2012-05-291-10/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-312-14/+52
|\ \ \ | | |/ | |/|
| * | Add an optional mechanism for physics modules to collect and return ↵Justin Clark-Casey (justincc)2012-05-311-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
| * | Fix collision filtering. The filter should be checked on the receiving part!Melanie2012-05-291-9/+9
| | |
* | | Re-add script collisions that were lost in a mergeMelanie2012-05-291-0/+2
| | |
* | | Merge branch 'avination'Melanie2012-05-292-178/+98
|\ \ \ | | |/ | |/|
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-281-176/+90
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs
generated by cgit v1.1 at 2024-12-26 20:59:03 +0000