aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'avination' into careminsterMelanie2013-01-271-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-6/+7
| | | | | | | | | | | | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid.
| * | | Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-262-2/+2
| | | | | | | | | | | | | | | | properly for temp-on-rez. Auto-return overrides sitting. Temp does not.
| * | | Stop temp-on-rez object from being deleted while an avatar sits on themMelanie2013-01-261-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-01-271-6/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid. Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
* | | | Merge branch 'master' into careminsterMelanie2013-01-261-0/+56
|\ \ \ \ | |/ / /
| * | | Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so ↵Justin Clark-Casey (justincc)2013-01-261-0/+56
| | |/ | |/| | | | | | | | | | | | | | | | | | | that these can be triggered by future code (not yet implemented). Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused. An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515 Thanks Garmin Kawaguichi and Signpost Marv.
* | | Merge branch 'master' into careminsterMelanie2013-01-251-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-231-0/+1
| | | | | | | | | | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
| * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+13
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \ \ | | |/ | |/|
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-2/+2
| | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | Merge branch 'avination' into careminsterMelanie2013-01-232-10/+30
|\ \ \ | |/ /
| * | Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| | |
| * | Limit active at targets to 8Melanie2013-01-211-2/+6
| | |
| * | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-01-232-1/+3
|\ \ \ | | | | | | | | | | | | careminster
| * \ \ Merge branch 'avination'Melanie2013-01-192-1/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| | * | dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-162-1/+3
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-01-232-14/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-211-0/+10
| | | | | | | | | | | | | | | routines on the physics engine. Won't make a difference for any existing scripts since ODE always returned Vector3.Zero.
| * | Check the existing ScenePresence.ParentPart to make sure we're not trying to ↵Justin Clark-Casey (justincc)2013-01-191-2/+1
| | | | | | | | | | | | | | | | | | | | | sit on a prim we're already sat upon, rather than looking up the part from scratch. An adaptation of commit 055b8a2 Having both ParentID and ParentPart references now is redundant. ParentID should probably be eliminated.
* | | Merge branch 'master' into careminsterMelanie2013-01-194-11/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * | Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-182-5/+33
| | | | | | | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
| * | Restore previous client AO behaviour by not allowing them to remove the ↵Justin Clark-Casey (justincc)2013-01-183-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | default animation but continue to allow scripts to do so. This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327 and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483 Animations may still exhibit different behaviour if both scripts and clients are adjusting animations. A change in the behaviour of client AO to not remove all animations may be a better long term approach.
| * | Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
| * | Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-161-23/+3
| | | | | | | | | | | | | | | | | | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-161-0/+4
| |\ \
| * | | Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
* | | | Merge branch 'avination' into careminsterMelanie2013-01-161-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Add Refresh() Method to ISerachModule to allow forcing a sim to resend it'sMelanie2013-01-151-1/+1
| | | | | | | | | | | | | | | | search data
* | | | JustinCC's core re-mergeMelanie2013-01-161-3/+23
| | | |
* | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵dahlia2013-01-141-0/+4
| | |/ | |/| | | | | | | other than the object currently sat on
* | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-3/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Fix exception reporting in SceneObjectPart so it logs what the exception is ↵Robert Adams2013-01-111-2/+2
| | | | | | | | | | | | rather than just saying it happened.
| * | Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* | | Merge branch 'avination' into careminsterMelanie2013-01-133-31/+39
|\ \ \ | | |/ | |/|
| * | go back bypassing sog updates control (test)UbitUmarov2013-01-111-12/+12
| | |
| * | update the last information sent in terse updates where they are sent to allUbitUmarov2013-01-111-10/+19
| | | | | | | | | | | | clients and not only on Scheduled sends
| * | remove redundant lastPhysGroupPos and lastPhysGroupRot checksUbitUmarov2013-01-111-16/+3
| | | | | | | | | | | | in SOG Update(). rootpart does more complet checks
| * | same for AngularVelocity. Use normal terse updates in place of sendingUbitUmarov2013-01-111-10/+18
| | | | | | | | | | | | imediatly. If that's good for physics, needs to be good for this
| * | keyframe. Don't use group UpdateRotation since this enqueues a terseUbitUmarov2013-01-111-2/+6
| | | | | | | | | | | | update and we are sending them imediatly
* | | Merge branch 'master' into careminsterMelanie2013-01-112-103/+123
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-102-94/+102
| | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
| * | refactor: route the final scene backup through the same code that handles ↵Justin Clark-Casey (justincc)2013-01-101-10/+1
| | | | | | | | | | | | | | | | | | periodic backup This is rather than making unnecessary duplicate checks that the SOG later performs again.
| * | Add "debug scene pbackup true|false" console command. This enables or ↵Justin Clark-Casey (justincc)2013-01-101-9/+30
| | | | | | | | | | | | | | | | | | disable periodic scene backup. For debug purposes. If false, scene is still saved on shutdown.
| * | Revert "Prevent empty Anim Packs"Melanie2013-01-091-12/+0
| | | | | | | | | | | | This reverts commit 5561333668f61f043cdfc0733a4eb50a1bcfb14e.
| * | Revert "Fix sequence id fr default anim"Melanie2013-01-091-1/+1
| | | | | | | | | | | | This reverts commit a775931a0cec9f65748c6e20dd2695edcbe21b7f.
generated by cgit v1.1 at 2024-10-24 03:15:48 +0000