Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-06-05 | 5 | -44/+50 |
|\ | |||||
| * | Add replaceable region modules to the "show modules" command | BlueWall | 2012-06-04 | 1 | -29/+49 |
| | | |||||
| * | Remove profile from basic configuration | Melanie | 2012-06-04 | 2 | -6/+0 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-06-04 | 1 | -1/+1 |
| |\ | |||||
| | * | Correct the delegate specification in EventManager.TriggerTerrainTainted. ↵ | Robert Adams | 2012-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Looks like the wrong one was cut and pasted. | ||||
| * | | Remove the "Profile" config as it's covered by the replaceable interface | Melanie | 2012-06-04 | 1 | -8/+0 |
| |/ | |||||
* | | Properly show per frame millisecond statistics per frame, not as amount of ↵ | Justin Clark-Casey (justincc) | 2012-06-04 | 1 | -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) | ||||
* | Fix build break whree accidentally did inv.Folders rather than ↵ | Justin Clark-Casey (justincc) | 2012-06-02 | 1 | -1/+1 |
| | | | | inv.Folders.Count in a minor change. | ||||
* | minor: tidy up some comments | Justin Clark-Casey (justincc) | 2012-06-02 | 1 | -4/+2 |
| | |||||
* | Fix various issues with http inventory | Justin Clark-Casey (justincc) | 2012-06-02 | 4 | -78/+85 |
| | | | | | | | | 1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead. 2) Folders with links were including the linked items in the descendents figure, when only the links should be included. 3) Links and linked items in link folders were not being included in the return data, and not in the correct order. Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default). | ||||
* | Instead of updating sim stats root agent, child, objects and scripts ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 2 | -33/+14 |
| | | | | accounts every single scene frame, update in the once every 3 seconds SimStatsReporter run | ||||
* | Add optional total avatars, total prims and active prims stats to ODE plugin. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+21 |
| | | | | | These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly. Total prims will not match scene total prims since physics total does not include phantom prims | ||||
* | If OdeScene.Near() returns no collision contacts, then exit as early as ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+4 |
| | | | | possible. All subsequent code is only relevant if there are contacts. | ||||
* | Add optional stat for the other collision time per frame not spent in ODE ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -1/+16 |
| | | | | native spaces or geom collision code | ||||
* | Add avatar forces calculation, prim force and raycasting per frame ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+46 |
| | | | | millisecond optional stats | ||||
* | Collection optional avatar and prim taint frame millisecond times | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+36 |
| | |||||
* | Remove recent optional native collision frame milliseconds stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -13/+1 |
| | | | | Unnecessary since this has now been broken down into space collisions and geom collisions | ||||
* | Add optional stat that records milliseconds spent notifying collision ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+14 |
| | | | | listeners in physics frames | ||||
* | Add avatar and prim update milliseconds per frame optional stats | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+31 |
| | |||||
* | Add option native step frame ms stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+21 |
| | |||||
* | Add total ODE frame time optional stat, as a sanity check on the main scene ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+21 |
| | | | | physics stat | ||||
* | Break down native ODE collision frame time stat into native space collision ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -4/+22 |
| | | | | and geom collision stats | ||||
* | Rename new collision stats to 'contacts' - there are/can be multiple ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -6/+6 |
| | | | | contacts per collision and this is what is actually being measured. | ||||
* | Stop adding an unnecessary duplicate _perloopcontact if the avatar is ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+4 |
| | | | | | | standing on a prim. This has already been added earlier on in the method. | ||||
* | minor: comment out currently unused OdeScene.sCollisionData | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+9 |
| | |||||
* | Add ODE avatar and prim collision numbers if extra stats collection is enabled. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -5/+34 |
| | |||||
* | Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -19/+13 |
| | | | | | | | | the first 25 that had non-zero collision scores. Also zeros collisions scores on all prims after report collection, not just the top 25. As before, this collision scores are only reset after a report is requested, which may give unrealistic numbers on the first request. So to see more realistic scores, ignore the first report and then refresh the request after a couple of seconds or so. | ||||
* | Add an optional mechanism for physics modules to collect and return ↵ | Justin Clark-Casey (justincc) | 2012-05-31 | 6 | -71/+271 |
| | | | | | | | | | | | 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. | ||||
* | Add console command "teleport user" to allow teleport from the region console | Justin Clark-Casey (justincc) | 2012-05-29 | 1 | -0/+189 |
| | | | | See "help teleport user" on the console for more details | ||||
* | Fix collision filtering. The filter should be checked on the receiving part! | Melanie | 2012-05-29 | 1 | -9/+9 |
| | |||||
* | refactor: factor out entity transfer state machine into a separate class to ↵ | Justin Clark-Casey (justincc) | 2012-05-28 | 3 | -239/+330 |
| | | | | make code more analyzable | ||||
* | If handling the failure of teleport, move agent state to CleaningUp when we ↵ | Justin Clark-Casey (justincc) | 2012-05-28 | 1 | -3/+6 |
| | | | | | | start the handling. Also fixes the log warning from ResetInTransit() if the state is cleared direct from Transferring or ReceiveAtDestination, as pointed out in mantis 5426 | ||||
* | minor: code formatting from 0b72f773 | Justin Clark-Casey (justincc) | 2012-05-26 | 1 | -12/+11 |
| | |||||
* | Mantis 6025 llRequestPermissions auto grant for NPCs. | Talun | 2012-05-26 | 1 | -1/+23 |
| | | | | | | If the script requesting permissions is owned by either the NPC or the NPCs owner (if the NPC is created as owned) then grant any permissions automatically. | ||||
* | If restating a region, clean up the physics scene after the main scene has ↵ | Justin Clark-Casey (justincc) | 2012-05-26 | 1 | -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. | ||||
* | Add Blake/Techplex to CONTRIBUTORS. Thanks! | Justin Clark-Casey (justincc) | 2012-05-26 | 1 | -0/+1 |
| | |||||
* | One can now get hyoergrid region co-ordinates with llRequestSimulatorData | Blake.Bourque | 2012-05-26 | 1 | -5/+21 |
| | |||||
* | Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type). | Justin Clark-Casey (justincc) | 2012-05-26 | 1 | -17/+7 |
| | | | | Also removes small bug where calling this method would add 1 to LPS, evne though all callers already did this. | ||||
* | Use SceneObjectPartInventory.GetInventoryItem() in OSSL.AvatarStopAnimation ↵ | Justin Clark-Casey (justincc) | 2012-05-26 | 1 | -14/+12 |
| | | | | instead of searching the task inventory manually. | ||||
* | refactor: replace LSL_Api.InventoryKey(string) largely with ↵ | Justin Clark-Casey (justincc) | 2012-05-26 | 3 | -45/+42 |
| | | | | | | SceneObjectPartInventory.GetInventoryItem(string) Also gets llStopAnimation() to call KeyOrName rather than duplicating logic. | ||||
* | Mantis 6028 osAvatarStopAnimation not stopping animations via UUID | Talun | 2012-05-25 | 1 | -7/+11 |
| | | | | | Corrected to stop animations using the animation UUID similar to llStopAnimation. See http://opensimulator.org/wiki/OsAvatarStopAnimation | ||||
* | Resolve some mono compiler warnings. | Justin Clark-Casey (justincc) | 2012-05-25 | 9 | -26/+33 |
| | |||||
* | on agent cross, remove from physics scene after its been placed in transit, ↵ | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -3/+7 |
| | | | | not before. | ||||
* | refactor: make ETM.CrossAgentToNewRegionAsync neighbourRegion == null check ↵ | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -90/+92 |
| | | | | return earlier to simplify method | ||||
* | Remove a call stack debugging line accidentally left in from a few days ago ↵ | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -2/+0 |
| | | | | at SceneObjectPartInventory.ApplyNextOwnerPermissions(). | ||||
* | Fix bug where a failed QueryAccess to a remove region would always have the ↵ | Justin Clark-Casey (justincc) | 2012-05-25 | 2 | -15/+21 |
| | | | | reason "Communications failure" no matter what the destination region actually returned | ||||
* | Stop it being possible for an agent to teleport back to its source region ↵ | Justin Clark-Casey (justincc) | 2012-05-25 | 3 | -28/+169 |
| | | | | | | | | | 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. | ||||
* | In remote QueryAccess, also receive the actual status (true|false) instead ↵ | Justin Clark-Casey (justincc) | 2012-05-25 | 2 | -2/+9 |
| | | | | | | | | | | of always true no matter what the callee actually returned. This was due to two things 1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"]. But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what 2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result. The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set. | ||||
* | Don't actually proceed on a within-region teleport if another is already ↵ | Justin Clark-Casey (justincc) | 2012-05-24 | 1 | -0/+2 |
| | | | | | | taking place, rather than just (falsely) logging that we're not going to proceed. An oversight from recent commit 9ab0c81 | ||||
* | On inter-region teleport, only stand the avatar up if the QueryAccess call ↵ | Justin Clark-Casey (justincc) | 2012-05-24 | 1 | -7/+7 |
| | | | | to the destination scene actually succeeds. |