aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 'avination' into careminsterMelanie2012-05-311-162/+162
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add advanced collision processing into ScenePresenceMelanie2012-05-291-162/+162
| |
* | Re-add script collisions that were lost in a mergeMelanie2012-05-291-0/+2
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-271-51/+82
|\ \ | |/
| * 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)
| * modulate collision sounds intensity with relative collision speedUbitUmarov2012-05-191-49/+78
| |
* | Merge branch 'master' into careminsterMelanie2012-05-191-3/+12
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Cleanup + change properties to set fields with private set : Thanks Justin ↵BlueWall2012-05-181-1/+0
| | | | | | | | | | | | for the tip.
| * | Provide Telehub setting to allow use of landmarksBlueWall2012-05-181-1/+2
| | | | | | | | | | | | Setting to allow use of landmarks to override telehub routing. Default is off.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-171-29/+28
| |\ \
| * | | Check agent limit against root agent count rather than both root and child ↵Justin Clark-Casey (justincc)2012-05-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | agents From sl docs such as http://community.secondlife.com/t5/English-Knowledge-Base/Managing-Private-Regions/ta-p/700115 agent should apply to avatars only. This makes sense from a user perspective, and also from a code perspective since child agents with no physics or actions take up a fraction of root agent resources. As such, the check is now only performed in Scene.QueryAccess() - cross and teleport check this before allowing an agent to translocate. This also removes an off-by-one error that could occur in certain circumstances on teleport when a new child agent was double counted when a pre-teleport agent update was performed. This does not affect an existing bug where limits or other QueryAccess() checks are not applied to avatars logging directly into a region.
* | | | Merge branch 'avination' into careminsterMelanie2012-05-171-1/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | increase avatars collisions report to 10 per sec, Stopped sound on avatar to ↵UbitUmarov2012-05-171-1/+1
| | | | | | | | | | | | | | | | volumedetect collision
| * | | add avatar colision sounds. Changed test sound UUIDUbitUmarov2012-05-171-0/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-05-171-29/+28
|\ \ \ \ | | |_|/ | |/| |
| * | | Force the default Telehub router if no matches are found in the config.BlueWall2012-05-171-29/+28
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-05-141-19/+84
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add configurable SpawnPointRoutingBlueWall2012-05-131-19/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use one of three selected methods to route avatar landing points when using Telehubs. The setting is in [Startup] using SpawnPointRouting = closest/random/sequence closest: The default setting. Routes avatar to the nearest SpawnPoint to the location. random: Picks random SpawnPoints to land the avatar. sequence: Follows a sequence to place the avatar on the next available SpawnPoint location Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
* | | Merge branch 'avination' into careminsterMelanie2012-05-131-0/+8
|\ \ \ | | |/ | |/|
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-121-0/+8
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-091-0/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-081-0/+2
| |\ \
| | * | Mantis 1456 same region teleport of a sitting avatar.Talun2012-05-091-0/+2
| | | | | | | | | | | | | | | | | | | | Region to region was fixed some time ago in EntityTransferModule. This applies the same fix for same region teleports.
| * | | Trigger event when scene presences are updatedDan Lake2012-05-081-0/+10
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-05-051-5/+50
|\ \ \ | | |/ | |/|
| * | Add the default animation to the child agent data updateMelanie2012-05-041-0/+3
| | |
| * | Reverse the order of physics event unsubscription to allow GC. Adapted from ↵Melanie2012-05-041-2/+2
| | | | | | | | | | | | Unit's reverted patch
| * | Retain velocity on walking crossing - adapted from Ubit's reverted patchMelanie2012-05-041-1/+13
| | |
| * | Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs ↵Melanie2012-05-041-18/+5
| | | | | | | | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);" This reverts commit 12c9916193bbb87aaa95407f798c241cbe5e23cb.
| * | *TO TEST/REVIEW* added current default animation in animationSet.cs ↵UbitUmarov2012-05-041-5/+18
| | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
| * | Stabilize sit position on region crossingMelanie2012-05-031-1/+7
| | |
| * | Clear permissions given to the object we stand up fromMelanie2012-05-031-1/+25
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-051-13/+56
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Mantis 60004 problems with damage and llSetDamage. In damage enabled areas ↵Talun2012-05-041-7/+46
| | | | | | | | | | | | this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
| * | Reinsert a 2000ms delay before closing a no longer required agent on the ↵Justin Clark-Casey (justincc)2012-05-031-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | source region after teleport to resolve Imprudence teleport problems. Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region. If Imprudence receives a DisableSimulator in this period, it quits. We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly. This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
* | | Merge branch 'master' into careminsterMelanie2012-05-021-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | simulator This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true. Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
* | | Merge branch 'master' into careminsterMelanie2012-04-301-67/+75
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 ↵Justin Clark-Casey (justincc)2012-04-301-73/+75
| | | | | | | | | | | | into SendControlsToScripts() (instead of SendControlToScripts()).
| * | Fixed: scripted controls didn't work if the avatar was sitting downOren Hurvitz2012-04-301-9/+15
| | | | | | | | | | | | This fixes a bug introduced in 6473674bbf6ce006512083902e8ff1796d8c8b22
* | | Merge branch 'avination'Melanie2012-04-291-0/+35
|\ \ \ | | |/ | |/|
| * | testUbitUmarov2012-04-271-3/+0
| | |
| * | testUbitUmarov2012-04-271-12/+9
| | |
| * | testUbitUmarov2012-04-271-1/+1
| | |
| * | itestUbitUmarov2012-04-271-2/+3
| | |
| * | itestUbitUmarov2012-04-271-2/+5
| | |
| * | testUbitUmarov2012-04-271-2/+2
| | |