aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-063-9/+18
|\ \ \ | | |/ | |/| | | | | | | | | | 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-041-1/+1
| | | | | | | | | | | | 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
| | * | Place the return back into collision sounds.Melanie2012-05-281-0/+4
| | | |
| | * | Modify SceneManeger to use a DoubleDictionary and work without locks.Melanie2012-05-281-176/+90
| | | | | | | | | | | | | | | | | | | | Changes to the scenes dictionary are exceedingly rare and using atomic operations makes the chance of collisions nearly nil in any case.
| * | | disable collision sounds for nowUbitUmarov2012-05-281-2/+8
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-05-274-191/+386
|\ \ \ | |/ /
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-213-174/+384
| |\ \
| | * | missing update script events callUbitUmarov2012-05-201-1/+12
| | | |
| | * | fix m_sitAvatarHeight to be half size.z, reduced default to a more ↵UbitUmarov2012-05-191-1/+1
| | | | | | | | | | | | | | | | resonable value ( 1m);
| | * | reduce useless waste of cpu. Make character collision events be done ↵UbitUmarov2012-05-191-1/+3
| | | | | | | | | | | | | | | | similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added)
| | * | a bit faster collision sound type verification plus a few fixes/changesUbitUmarov2012-05-192-53/+100
| | | |
| | * | temp work: sounds simetric acording to materials, still 'window close' test ↵UbitUmarov2012-05-191-30/+98
| | | | | | | | | | | | | | | | sound. Included in coment full assimetric ( since seems we have files for it now ) case with some uuids
| | * | modulate collision sound intensity with collision relative velocity for ↵UbitUmarov2012-05-192-46/+89
| | | | | | | | | | | | | | | | parts also
| | * | modulate collision sounds intensity with relative collision speedUbitUmarov2012-05-192-81/+120
| | | |
| * | | Fix setting positions of attachments. The recent security fix regardingMelanie2012-05-191-1/+1
| | | | | | | | | | | | | | | | prim entry messed it up.
| * | | Merge branch 'ubitwork' into avinationMelanie2012-05-171-28/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs
| | * | removed redundant colision sounds. Temporary muted sounds ( returns at top ↵UbitUmarov2012-05-171-28/+13
| | | | | | | | | | | | | | | | of funtions ).
| * | | Temprorarily disable collision sounds until we have some sound bitesMelanie2012-05-171-1/+5
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-05-276-58/+125
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | If restating a region, clean up the physics scene after the main scene has ↵Justin Clark-Casey (justincc)2012-05-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | been closed not before. If this is done before then on ODE agent update calls still incoming can fail as they try to use a raycastmanager that has been disposed. Bullet plugin does nothing on Dispose() However, I wouldn't be at all surprised if individual region restarting was buggy in lots of other areas.
| * | refactor: replace LSL_Api.InventoryKey(string) largely with ↵Justin Clark-Casey (justincc)2012-05-261-8/+14
| | | | | | | | | | | | | | | | | | SceneObjectPartInventory.GetInventoryItem(string) Also gets llStopAnimation() to call KeyOrName rather than duplicating logic.
| * | Remove a call stack debugging line accidentally left in from a few days ago ↵Justin Clark-Casey (justincc)2012-05-251-2/+0
| | | | | | | | | | | | at SceneObjectPartInventory.ApplyNextOwnerPermissions().
| * | Stop it being possible for an agent to teleport back to its source region ↵Justin Clark-Casey (justincc)2012-05-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | before the source region has finished cleaning up old agent data and structures. If this is allowed, then the client usually gets forcibly logged out and data structures might be put into bad states. To prevent this, the binary state machine of EMT.m_agentsInTransit is replaced with a 4 state machine (Preparing, Transferring, ReceivedAtDestination, CleaningUp). This is necessary because the source region needs to know when the destination region has received the user but a teleport back cannot happen until the source region has cleaned up. Tested on standalone, grid and with v1 and v3 clients.
| * | If an agent is still registered as 'in transit' by the source region, don't ↵Justin Clark-Casey (justincc)2012-05-242-36/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow an immediate teleport back. This is to help relieve a race condition when an agent teleports then immediately attempts to teleport back before the source region has properly cleaned up/demoted the old ScenePresence. This is rare in viewers but much more possible via scripting or region module. However, more needs to be done since virtually all clean up happens after the transit flag is cleared . Possibly need to add a 'cleaning up' state to in transit. This change required making the EntityTransferModule and HGEntityTransferModule per-region rather than shared, in order to allow separate transit lists. Changes were also required in LocalSimulationConnector. Tested in standalone, grid and with local and remote region crossings with attachments.
| * | Add "show scene" command which lists stats for the currently selected ↵Justin Clark-Casey (justincc)2012-05-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console scene(s) This includes prim count, script count, avatar count, etc. Information is currently the same as "show stats", though show stats can only show one scene at a time because it listens for the latest outgoing stats packet (a bad approach that needs to change). Might be better to tie this module into the other stats module to display arbitrary stats rather than fetching directly from scene.SimStatsReporter. Console command is "show scene" because "show region" already exists for the grid service, which is unfortunate. Might need to make a distinction between "scene" relating to a live scene and "region" relating to more static region data (url, coords, etc.)
| * | Fix bug where an avatar that had an object they owned attached through ↵Justin Clark-Casey (justincc)2012-05-233-3/+26
| | | | | | | | | | | | | | | | | | | | | llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene. This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
| * | minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-211-5/+5
| | |
generated by cgit v1.1 at 2024-12-21 15:00:57 +0000