aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-191-1/+1
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
* | minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| | | | | | | | prims
* | Merge branch 'avination' into careminsterMelanie2012-07-161-2/+6
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Revert "Add instrumentation to log finalizer being called. Suppressed for ↵Melanie2012-07-121-1/+0
| | | | | | | | | | | | | | | | | | backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
| * | Revert "Place instrumentation in the proper place. This needs reverting, too!"Melanie2012-07-121-1/+1
| | | | | | | | | | | | This reverts commit d9b0b03aa3f92bcd860e4edb656cf6b1221776a6.
| * | Place instrumentation in the proper place. This needs reverting, too!Melanie2012-07-111-1/+1
| | |
| * | Add instrumentation to log finalizer being called. Suppressed for backupMelanie2012-07-111-0/+1
| | | | | | | | | | | | | | | interim copies to avoid spammage. Not for release to the grid, must be reverted first!
| * | Change order of operations on backup to ensure keyframe motions are backedMelanie2012-07-111-2/+6
| | | | | | | | | | | | up properly
* | | Merge branch 'master' into careminsterMelanie2012-07-121-17/+74
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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-15/+73
| | | | | | | | | | | | SOG and SOP. Should have no functionality changes.
* | | Merge branch 'master' into careminsterMelanie2012-07-111-10/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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
| * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-091-0/+14
| | | | | | | | | | | | | | | | | | 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.
| * | Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-071-10/+0
| | | | | | | | | | | | | | | This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
* | | Merge branch 'avination' into careminsterMelanie2012-07-061-5/+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
| * | *CHECK/REVIEW* comented out not used sp.ParentPosition. Comented out ↵UbitUmarov2012-06-171-5/+13
| | | | | | | | | | | | SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment )
* | | Merge branch 'master' into careminsterMelanie2012-07-051-2/+21
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: Add some method doc to HasGroupChanged and Schedule ↵Justin Clark-Casey (justincc)2012-07-031-2/+21
| | | | | | | | | | | | GroupForFull/PartUpdate() to indicate when region modules need to invoke them
* | | Merge branch 'master' into careminsterMelanie2012-06-261-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Fix bug where attachments would not retain position if just rotated and not ↵Justin Clark-Casey (justincc)2012-06-221-0/+5
| | | | | | | | | | | | | | | | | | moved. This was because we were not setting AttachedPos in SOG.UpdateGroupPositionPR, unlike UpdateGroupPosition
* | | Merge branch 'master' into careminsterMelanie2012-06-211-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | | | | | instead of magic numbers
* | | Merge branch 'avination' into careminsterMelanie2012-06-151-2/+6
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | change object drag so it applies a impulse and not a push force so it works ↵UbitUmarov2012-06-111-2/+6
| | | | | | | | | | | | as before my fix to impulse/forces
* | | Merge branch 'master' into careminsterMelanie2012-06-141-0/+16
|\ \ \ | | |/ | |/|
| * | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵Justin Clark-Casey (justincc)2012-06-141-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | Port Avination's collision fixes to core.Melanie2012-05-151-11/+0
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-071-1/+2
|\ \ \ | | |/ | |/|
| * | Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| | | | | | | | | | | | is not listening to at_target
* | | Merge branch 'avination' into careminsterMelanie2012-05-271-1/+1
|\ \ \ | |/ /
| * | Fix setting positions of attachments. The recent security fix regardingMelanie2012-05-191-1/+1
| | | | | | | | | | | | prim entry messed it up.
* | | Merge branch 'avination' into careminsterMelanie2012-05-141-12/+2
|\ \ \ | |/ /
| * | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-141-11/+0
| | |
| * | Check parcel entry permissions when moving objectsMelanie2012-05-141-1/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-071-1/+1
|\ \ \ | | |/ | |/|
| * | Stop llSetPos from sending one update per child primMelanie2012-05-061-1/+1
| | |
| * | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵Melanie2012-04-251-2/+40
| | | | | | | | | | | | scripts work. Fixes Mantis #5990
* | | Merge branch 'avination' into careminsterMelanie2012-05-071-2/+4
|\ \ \ | | |/ | |/|
| * | SOG: tell physics about when we want a force or a impulse. (sorry add to ↵UbitUmarov2012-05-051-2/+4
| | | | | | | | | | | | change here also)
* | | Merge branch 'avination' into careminsterMelanie2012-05-051-12/+54
|\ \ \ | |/ /
| * | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ↵UbitUmarov2012-05-041-12/+54
| | | | | | | | | | | | changed crossing code to restore sitting avas in case of group cross fail
* | | Merge branch 'avination'Melanie2012-05-031-4/+12
|\ \ \ | |/ /
| * | Improved sitted avatars crossings ( plus tests on vehicles)UbitUmarov2012-05-021-4/+12
| | |
* | | Merge branch 'avination'Melanie2012-05-021-2/+14
|\ \ \ | |/ /
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-021-2/+14
| |\ \
| | * | llGetGeometricCenter...UbitUmarov2012-04-291-2/+14
| | | |
* | | | Merge branch 'avination'Melanie2012-05-021-1/+1
|\ \ \ \ | |/ / /
| * | | Fix saving of attachment positionsMelanie2012-05-011-1/+1
| |/ /
* | | Merge branch 'avination'Melanie2012-04-291-5/+41
|\ \ \ | |/ /
| * | remove repeated set of group rotation to physicsUbitUmarov2012-04-291-2/+3
| | |
| * | SOG bug fix in group rotations updatesUbitUmarov2012-04-291-4/+6
| | |
generated by cgit v1.1 at 2024-12-30 11:47:48 +0000