aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-301-2/+2
| | | | newgroup information avaiable.
* [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-301-0/+3
| | | | | fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
* [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-1/+4
| | | | threads overlaps, some null objects exceptions, region crossing...
* Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-231-0/+21
|
* Merge branch 'master' into careminsterMelanie2012-08-031-1/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵SignpostMarv2012-08-031-1/+1
| | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer
* | Merge branch 'avination' into ubitworkUbitUmarov2012-07-171-29/+171
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-07-121-8/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| | * Many explanitory comments added to the link and delink code inRobert Adams2012-07-111-8/+20
| | | | | | | | | | | | SOG and SOP. Should have no functionality changes.
| * | Merge branch 'avination' into careminsterMelanie2012-07-111-22/+57
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * \ \ Merge branch 'master' into careminsterMelanie2012-07-111-7/+122
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵Justin Clark-Casey (justincc)2012-07-101-0/+6
| | | | | | | | | | | | | | | | and SOP.RemoveSittingAvatar()
| | * | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-101-6/+1
| | | | | | | | | | | | | | | | | | | | 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-1/+6
| | | |
| | * | Move common code to detect whether a part has a valid sit target into a SOP ↵Justin Clark-Casey (justincc)2012-07-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵Justin Clark-Casey (justincc)2012-07-101-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information
| | * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-091-7/+91
| | | | | | | | | | | | | | | | | | | | | | | | 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-28/+56
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-06-211-3/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * | | refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | | | | | | | | | | | | | instead of attachmentpoint magic numbers.
| | * | | minor: If logging because mesh/sculpt data isn't present for an object, log ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | object UUID rather than local id, since UUID doesn't potentially vary between simulator starts.
| * | | | Merge branch 'master' into careminsterMelanie2012-06-141-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵Justin Clark-Casey (justincc)2012-06-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | point. HUDs attachment points are private. Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations. This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs. It appears this is no longer true with Neck and Root (Avatar Center)
| * | | | Merge branch 'avination' into careminsterMelanie2012-06-061-7/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-311-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-311-9/+9
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fix collision filtering. The filter should be checked on the receiving part!Melanie2012-05-291-9/+9
| | | | | | |
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-05-271-22/+86
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-171-5/+40
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-161-1/+12
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-151-501/+184
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix issue where loading OARs could sometimes result in link numbers being ↵Justin Clark-Casey (justincc)2012-05-151-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reordered. This was because the parts in scene objects were sometimes not serialized in link order. This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this had not been done in the SerialiserModule methods that OAR loading used. Add regression test for same. Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749
| * | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-05-151-50/+124
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * | | | | | | | | Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loads roots before children like MySQL does.
| | * | | | | | | | | Try to fix sqlite breakageMelanie2012-05-151-0/+3
| | | | | | | | | | |
| | * | | | | | | | | Port Avination's collision fixes to core.Melanie2012-05-151-501/+181
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-05-141-501/+171
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-091-4/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | Remove physics actor related race conditions in SetVehicleFlags() and ↵Justin Clark-Casey (justincc)2012-05-091-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetPhysicsAxisRotation() sop.PhysActor can currently become null at any time.
| * | | | | | | | | | Merge branch 'avination'Melanie2012-05-021-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'avination'Melanie2012-04-291-3/+37
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-231-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-04-231-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * | | | | | | | | | | | Fix bug where setting phantom on a prim would result in a server log message ↵Justin Clark-Casey (justincc)2012-04-221-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
| * | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-221-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Add regression test for prim status when root prim in a new linkset is ↵Justin Clark-Casey (justincc)2012-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-physical
| | * | | | | | | | | | | | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-211-3/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | don't subscribe collision events for nonphysical parts only because ofUbitUmarov2012-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collision sounds. Let them be passive
* | | | | | | | | | | | | | Revert "Add instrumentation to log finalizer being called. Suppressed for ↵Melanie2012-07-121-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
generated by cgit v1.1 at 2024-12-22 10:26:53 +0000