aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-261-1/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* \ Merge branch 'master' into careminsterMelanie2012-10-261-7/+7
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * Changed "course" to "coarse" in several placesOren Hurvitz2012-10-251-7/+7
| |
* | Merge branch 'avination' into careminsterMelanie2012-09-101-3/+6
|\ \
| * | remove fireandforget call to EnableChildAgents at end on CompleteMovement,UbitUmarov2012-09-071-1/+3
| | | | | | | | | | | | since this is already on own thread and its at the end of it.
| * | Make friend notifies and closing child agents async because both canMelanie2012-09-041-1/+1
| | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
| * | a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-041-1/+2
| | | | | | | | | | | | flight. FS 4.2.2 does not.
* | | Merge branch 'master' into careminsterMelanie2012-09-071-5/+8
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | formattingSignpostMarv2012-09-041-6/+6
| | |
| * | although the attachmentPoint argument is a uint, zero is not a valid ↵SignpostMarv2012-09-041-1/+4
| | | | | | | | | | | | attachment point
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-1/+3
|\ \ \ | |/ /
| * | Extend "Restarting scripts in attachments" debug log message to show actual ↵Justin Clark-Casey (justincc)2012-08-241-1/+3
| | | | | | | | | | | | name of user and the region they are in
* | | Merge branch 'master' into careminsterMelanie2012-08-181-5/+10
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * BulletSim: Properly regenerate hulls when objects made physical.Robert Adams2012-08-171-8/+8
| | | | | | | | | | This fixes the problem of non-base shapes (cubes and spheres) falling through the terrain.
| * Modify order of code so SOP doesn't set the physics actor flyingRobert Adams2012-08-171-7/+12
| | | | | | | | | | | | property multiple times every time Update is called. This eliminates zillions of settings which is better for BulletSim. The should be no functionality change.
* | on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
| |
* | Merge branch 'avination' into careminsterMelanie2012-08-011-1/+3
|\ \
| * | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-201-13/+14
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Stop explicitly closing and nulling out Animator in order to prevent NREs in ↵Justin Clark-Casey (justincc)2012-07-191-16/+6
| | | | | | | | | | | | | | various places due to race conditions. Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking. The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved.
* | Merge branch 'master' into careminsterMelanie2012-07-111-42/+32
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * If a part has a sit target and an avatar is already sitting, allow another ↵Justin Clark-Casey (justincc)2012-07-101-7/+4
| | | | | | | | | | | | | | avatar to sit in the position given if no sit target was set. Previous behave was that the second avatar could not sit. This matches behaviour observed on the LL grid.
| * refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵Justin Clark-Casey (justincc)2012-07-101-5/+0
| | | | | | | | and SOP.RemoveSittingAvatar()
| * Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-101-2/+2
| | | | | | | | | | This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2. On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly
| * refactor: Add SOP.IsSitTargetOccupied to improve readabilityJustin Clark-Casey (justincc)2012-07-101-2/+2
| |
| * refactor: use sit orientation argument passed in to SP.SendSitResponse() ↵Justin Clark-Casey (justincc)2012-07-101-4/+2
| | | | | | | | | | | | rather than creating a new copy There are no issues with side-effects since this is a struct.
| * Move common code to detect whether a part has a valid sit target into a SOP ↵Justin Clark-Casey (justincc)2012-07-101-30/+5
| | | | | | | | | | | | | | property rather than being repeated in SP. This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical. Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero.
| * Remove log line accidentally left in SP.SendSitResponse()Justin Clark-Casey (justincc)2012-07-101-1/+1
| |
| * Don't allow a prim to be sat upon if its part of an attachmentJustin Clark-Casey (justincc)2012-07-091-0/+9
| |
| * Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-091-1/+17
| | | | | | | | | | | | This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar. This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar. Recording HashSet is null if there are no sitting avatars in order to save memory.
* | Merge branch 'avination' into careminsterMelanie2012-07-061-10/+13
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | fix a seg fault in sp.csUbitUmarov2012-06-251-1/+2
| | |
| * | *CHECK/REVIEW* comented out not used sp.ParentPosition. Comented out ↵UbitUmarov2012-06-171-9/+11
| | | | | | | | | | | | SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment )
* | | Merge branch 'master' into careminsterMelanie2012-06-281-37/+4
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | refactor: Move ScenePresence <-> AgentData attachments copying code into ↵Justin Clark-Casey (justincc)2012-06-271-37/+4
| | | | | | | | | | | | AttachmentsModule.
* | | Merge branch 'master' into careminsterMelanie2012-06-261-3/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | When attachments are being saved and deleted for a closing root agent, ↵Justin Clark-Casey (justincc)2012-06-251-3/+0
| | | | | | | | | | | | | | | | | | delete first to avoid a hud race condition with update threads. If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
* | | Merge branch 'avination' into careminsterMelanie2012-06-151-0/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Changed t adding the avatar dependent sit offset and not subtracting, so ↵UbitUmarov2012-06-131-2/+4
| | | | | | | | | | | | not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails()
| * | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. ↵UbitUmarov2012-06-131-1/+2
| | | | | | | | | | | | Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams.
| * | Moved auxiliar funtions of last commit from sop to lsl api since they are ↵UbitUmarov2012-06-121-34/+0
| | | | | | | | | | | | only used on one place each
| * | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ↵UbitUmarov2012-06-121-0/+34
| | | | | | | | | | | | code in SOP.cs
* | | 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-111-2/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-06-081-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Don't make duplicate call to ScenePresence.Close() separately in ↵Justin Clark-Casey (justincc)2012-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.1 at 2024-12-24 17:57:17 +0000