aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Re-add script collisions that were lost in a mergeMelanie2012-05-291-0/+2
|
* Merge branch 'avination'Melanie2012-05-297-252/+245
|\
| * fix avatars collisions on sim crossings and other few cases where ↵UbitUmarov2012-05-281-2/+1
| | | | | | | | freemove() is called
| * a bit cleaner code (?) on sculpts/meshs meshing checkingUbitUmarov2012-05-281-7/+6
| |
| * let meshs work indenpendently of mesh_sculpted_prim config optionUbitUmarov2012-05-281-29/+25
| |
| * Merge branch 'avination' into ubitworkUbitUmarov2012-05-282-180/+103
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs
| | * Place the return back into collision sounds.Melanie2012-05-281-0/+4
| | |
| | * If a region is not found on a simulator, make the health query returnMelanie2012-05-281-4/+13
| | | | | | | | | | | | | | | | | | 0 to indicate it's still starting rather than an error. There are other methods that can discover the presence of a region and slow starting regions may cause the watchdog to kill them while they start,
| | * Merge branch 'ubitwork' into avinationMelanie2012-05-284-38/+110
| | |\
| | * | 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
| | | |
| * | | revert making sculpts phanton if sculpt meshing option is offUbitUmarov2012-05-281-2/+0
| | |/ | |/|
| * | Let OOB information usable outside ubitodeUbitUmarov2012-05-273-29/+33
| | |
| * | also don't collide sculps or meshs if meshing is OFFUbitUmarov2012-05-211-0/+2
| | |
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-212-2/+2
| |\ \ | | |/
| * | try to let avas climb higher steps. Will only work in some cases, may have ↵UbitUmarov2012-05-212-9/+75
| | | | | | | | | | | | bad effects, so needs some more testing
* | | Merge branch 'avination' into careminsterMelanie2012-05-278-345/+564
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-217-328/+562
| |\ \ | | |/
| | * missing update script events callUbitUmarov2012-05-201-1/+12
| | |
| | * minor changesUbitUmarov2012-05-203-32/+24
| | |
| | * 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-194-126/+148
| | | | | | | | | | | | 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 character IsPhysicalUbitUmarov2012-05-191-1/+1
| | |
| | * add colliders relative velocity projected in collision direction to ↵UbitUmarov2012-05-193-1/+13
| | | | | | | | | | | | collisions report information.
| * | 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-2755-940/+2338
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | minor: code formatting from 0b72f773Justin Clark-Casey (justincc)2012-05-261-12/+11
| | |
| * | Mantis 6025 llRequestPermissions auto grant for NPCs.Talun2012-05-261-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-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.
| * | Add Blake/Techplex to CONTRIBUTORS. Thanks!Justin Clark-Casey (justincc)2012-05-261-0/+1
| | |
| * | One can now get hyoergrid region co-ordinates with llRequestSimulatorDataBlake.Bourque2012-05-261-5/+21
| | |
| * | Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type).Justin Clark-Casey (justincc)2012-05-261-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-261-14/+12
| | | | | | | | | | | | instead of searching the task inventory manually.
| * | refactor: replace LSL_Api.InventoryKey(string) largely with ↵Justin Clark-Casey (justincc)2012-05-263-45/+42
| | | | | | | | | | | | | | | | | | SceneObjectPartInventory.GetInventoryItem(string) Also gets llStopAnimation() to call KeyOrName rather than duplicating logic.
| * | Mantis 6028 osAvatarStopAnimation not stopping animations via UUIDTalun2012-05-251-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-259-26/+33
| | |
| * | on agent cross, remove from physics scene after its been placed in transit, ↵Justin Clark-Casey (justincc)2012-05-251-3/+7
| | | | | | | | | | | | not before.
| * | refactor: make ETM.CrossAgentToNewRegionAsync neighbourRegion == null check ↵Justin Clark-Casey (justincc)2012-05-251-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-251-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-252-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-253-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-252-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-241-0/+2
| | | | | | | | | | | | | | | | | | taking place, rather than just (falsely) logging that we're not going to proceed. An oversight from recent commit 9ab0c81
generated by cgit v1.1 at 2024-10-27 09:15:02 +0000