| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 1 | -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 ↵ | Melanie | 2012-07-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980. | ||||
| | * | Revert "Place instrumentation in the proper place. This needs reverting, too!" | Melanie | 2012-07-12 | 1 | -1/+1 |
| | | | | | | | | | This reverts commit d9b0b03aa3f92bcd860e4edb656cf6b1221776a6. | ||||
| | * | Place instrumentation in the proper place. This needs reverting, too! | Melanie | 2012-07-11 | 1 | -1/+1 |
| | | | |||||
| | * | Add instrumentation to log finalizer being called. Suppressed for backup | Melanie | 2012-07-11 | 1 | -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 backed | Melanie | 2012-07-11 | 1 | -2/+6 |
| | | | | | | | | | up properly | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 1 | -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 in | Robert Adams | 2012-07-11 | 1 | -15/+73 |
| | | | | | | | | | | | | | SOG and SOP. Should have no functionality changes. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -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-09 | 1 | -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-07 | 1 | -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 careminster | Melanie | 2012-07-06 | 1 | -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 ↵ | UbitUmarov | 2012-06-17 | 1 | -5/+13 |
| | | | | | | | | | | | | | SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment ) | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-05 | 1 | -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-03 | 1 | -2/+21 |
| | | | | | | | | | | | | | GroupForFull/PartUpdate() to indicate when region modules need to invoke them | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-26 | 1 | -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-22 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | moved. This was because we were not setting AttachedPos in SOG.UpdateGroupPositionPR, unlike UpdateGroupPosition | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-21 | 1 | -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-20 | 1 | -2/+3 |
| | | | | | | | | | | | | | instead of magic numbers | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-06-15 | 1 | -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 ↵ | UbitUmarov | 2012-06-11 | 1 | -2/+6 |
| | | | | | | | | | | | | | as before my fix to impulse/forces | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 1 | -0/+16 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -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. | Melanie | 2012-05-15 | 1 | -11/+0 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-06-07 | 1 | -1/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Make not_at_target stop when the target is reached even if the script | Melanie | 2012-06-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | is not listening to at_target | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-27 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Fix setting positions of attachments. The recent security fix regarding | Melanie | 2012-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | prim entry messed it up. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-14 | 1 | -12/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Completely revamp collision handling. Now works as it is supposed to. | Melanie | 2012-05-14 | 1 | -11/+0 |
| | | | | |||||
| | * | | Check parcel entry permissions when moving objects | Melanie | 2012-05-14 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-07 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Stop llSetPos from sending one update per child prim | Melanie | 2012-05-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵ | Melanie | 2012-04-25 | 1 | -2/+40 |
| | | | | | | | | | | | | | scripts work. Fixes Mantis #5990 | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-07 | 1 | -2/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | SOG: tell physics about when we want a force or a impulse. (sorry add to ↵ | UbitUmarov | 2012-05-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | change here also) | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-05 | 1 | -12/+54 |
| |\ \ \ | |/ / | |||||
| | * | | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ↵ | UbitUmarov | 2012-05-04 | 1 | -12/+54 |
| | | | | | | | | | | | | | changed crossing code to restore sitting avas in case of group cross fail | ||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-03 | 1 | -4/+12 |
| |\ \ \ | |/ / | |||||
| | * | | Improved sitted avatars crossings ( plus tests on vehicles) | UbitUmarov | 2012-05-02 | 1 | -4/+12 |
| | | | | |||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-02 | 1 | -2/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-05-02 | 1 | -2/+14 |
| | |\ \ | |||||
| | | * | | llGetGeometricCenter... | UbitUmarov | 2012-04-29 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | Merge branch 'avination' | Melanie | 2012-05-02 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fix saving of attachment positions | Melanie | 2012-05-01 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'avination' | Melanie | 2012-04-29 | 1 | -5/+41 |
| |\ \ \ | |/ / | |||||
| | * | | remove repeated set of group rotation to physics | UbitUmarov | 2012-04-29 | 1 | -2/+3 |
| | | | | |||||
| | * | | SOG bug fix in group rotations updates | UbitUmarov | 2012-04-29 | 1 | -4/+6 |
| | | | | |||||
| | * | | fix llGetCenterOfMass ( checked with ubitODE only) | UbitUmarov | 2012-04-28 | 1 | -0/+33 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-25 | 1 | -16/+27 |
| |\ \ \ | |/ / | | | | | | | careminster | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |