aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-124-194/+73
|\ | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵Dan Lake2011-12-121-3/+1
| | | | | | | | IsColliding
| * Mantis 5816: osParseJSON Decoding Problemsnebadon2011-12-113-191/+72
| | | | | | | | | | | | | | osParseJSON uses hand-crafted decoding that has two issues * does not seem to handle top-level JSON lists * does not seem to handle unicode text thanks otakup0pe!
| * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-18/+18
| |
* | Fix llGetLinkKey to report avatars properlyMelanie2011-12-091-19/+0
| |
* | Fix task inventory givingMelanie2011-12-071-15/+23
| |
* | Add the proper result code as per the LL announcement for ↵Melanie2011-12-051-1/+1
| | | | | | | | llTransferLindenDollars
* | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵Melanie2011-12-051-20/+20
|\ \ | | | | | | | | | into bigmerge
| * | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-20/+20
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Use agent.Animator.CurrentMovementAnimation in llGetAgentInfo() rather than ↵Justin Clark-Casey (justincc)2011-12-031-1/+1
| | | | | | | | asking for a new determination
| * Rename ScenePresenceAnimator.GetMovementAnimation() -> ↵Justin Clark-Casey (justincc)2011-12-031-1/+1
| | | | | | | | DetermineMovementAnimation() for better code readability
* | Fix setting seated avatar position and make llSameGroup work as in SL.Melanie2011-12-051-2/+4
| |
* | Implement llTransferLindenDollarsMelanie2011-12-013-0/+83
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-283-1/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-11-262-2/+2
| |\
| | * When removing an LSL sensor for a script (e.g. through llResetScript() or ↵Justin Clark-Casey (justincc)2011-11-261-1/+1
| | | | | | | | | | | | | | | | | | state change), don't also remove sensors for other scripts in the same prim. Hopefully fixes http://opensimulator.org/mantis/view.php?id=4448 and http://opensimulator.org/mantis/view.php?id=4452
| | * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-261-1/+1
| | |
| * | Add missing property to llGetLinkPrimitiveParamsBlueWall2011-11-262-0/+4
| |/
* | Remove unused and broken OffsetRotation from ScenePresenceMelanie2011-11-051-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-042-7/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-033-11/+11
| | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-033-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
* | Merge branch 'master' into bigmergeMelanie2011-11-031-9/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-021-315/+362
| |\
| * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs.
* | | Merge branch 'master' into bigmergeMelanie2011-11-021-322/+350
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Restore the recursive calling of PRIM_LINK_TARGET because the version I madeMelanie2011-11-021-327/+334
| | | | | | | | | | | | breaks LINK_SET et al.
| * | Some positioning fixes from AVN trunkMelanie2011-11-021-1/+42
| | |
| * | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenarioMelanie2011-11-021-4/+3
| |/
* | Merge branch 'master' into bigmergeMelanie2011-10-301-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Remove completely unused SOG.Rotation parameterJustin Clark-Casey (justincc)2011-10-291-1/+1
| | | | | | | | We always use SOP.Rotation instead
* | Merge branch 'master' into bigmergeMelanie2011-10-272-23/+17
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Continuation of previous checkin. Found more places where ↵Dan Lake2011-10-271-15/+9
| | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence.
| * Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake2011-10-271-10/+10
| | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
* | Merge branch 'master' into bigmergeMelanie2011-10-263-10/+86
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-261-6/+61
| | | | | | | | | | | | PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Implementation of PRIM_OMEGA, but only for settingSignpostMarv Martin2011-10-262-4/+18
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Implementing PRIM_LINK_TARGET, but only for setting paramsSignpostMarv Martin2011-10-262-4/+14
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Add case to Lightshare/WindlightBlueWall2011-10-221-0/+3
| | | | | | | | Thanks thomax for a patch to add handling for Sun/Moon pos.
* | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-191-1/+1
| | | | | | | | scene presence by client ID.
* | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmergeMelanie2011-10-251-22/+46
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix resume scripts.Justin Clark-Casey (justincc)2011-10-191-8/+32
| | | | | | | | | | On resume, we need to place requeue the script for event processing if there are any events on the queue. Also need to do this under m_Script lock in order to avoid a race
* | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add "scripts suspend" and "scripts resume" commands.Justin Clark-Casey (justincc)2011-10-191-2/+4
| | | | | | | | | | These aim currently to suspend and resume all scripts. However, resume isn't currently working due to what looks like a bug in resume functionality itself.
* | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmergeMelanie2011-10-251-4/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * add current script status to "scripts show" command (running, suspended, etc.)Justin Clark-Casey (justincc)2011-10-191-4/+5
| |
* | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmergeMelanie2011-10-251-2/+0
|\ \ | |/
generated by cgit v1.1 at 2024-12-23 15:04:01 +0000