aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-033-0/+19
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵Justin Clark-Casey (justincc)2012-08-031-1/+1
| | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
| * reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-023-0/+19
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2012-08-011-5/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Look up the NPC module when the SensorRepeat class is created, rather than ↵Justin Clark-Casey (justincc)2012-08-011-5/+6
| | | | | | | | on every single sensor sweep.
* | Merge branch 'master' into careminsterMelanie2012-08-012-37/+80
|\ \ | |/
| * Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵Justin Clark-Casey (justincc)2012-07-311-35/+43
| | | | | | | | | | | | | | | | SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep. A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal. Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status. This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
| * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-311-2/+37
| | | | | | | | constants to the script engine.
* | Merge branch 'avination' into careminsterMelanie2012-07-291-2/+53
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-4/+10
| | |
| * | When controls are released by script, don't drop the permission toMelanie2012-07-291-2/+0
| | | | | | | | | | | | retake them.
| * | Implement the linefeed URL hack for ShoutCast and other servicesMelanie2012-07-271-0/+53
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-291-4/+10
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-1/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-285-3/+56
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | LSL/OSSL lacks Math.Min & Math.Max implementations.SignpostMarv2012-07-283-0/+54
| | |
| * | Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-2/+0
| | |
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | | | | | with other monitoring code from OpenSim.Framework
| * | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-1/+1
| | | | | | | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
* | | Remove support for the OS_NPC constant. That one seems to be overly paranoidMelanie2012-07-252-4/+2
| | | | | | | | | | | | to have and confuses the issue.
* | | Merge branch 'master' into careminsterMelanie2012-07-233-6/+34
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * | As per opensim-dev mailing list discussion, extend llGetDetectedType() to ↵Justin Clark-Casey (justincc)2012-07-201-5/+28
| | | | | | | | | | | | | | | | | | return OS_NPC if an OS npc is detected. The detection will also return agent is the NPC has been created with the OS_NPC_SENSE_AS_AGENT option.
| * | As per opensim-dev mailing list conversation, introduce OS_NPC constant for ↵Justin Clark-Casey (justincc)2012-07-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | use with llSensor() This same constant will later be used with llGetDetectedType(). This constant has a different name from NPC to avoid possible conflict with future LSL changes. This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value. Using the 'NPC' constant with llSensor() will remain valid but is deprecated.
* | | Merge branch 'master' into careminsterMelanie2012-07-204-3/+39
|\ \ \ | |/ /
| * | Enables support for UUIDs to be returned in lists fromMic Bowman2012-07-201-3/+13
| | | | | | | | | | | | | | | | | | modInvoke commands. Thanks SignpostMarv!!!
| * | Implements a very useful OSSL function to test a string to seeMic Bowman2012-07-203-0/+26
| | | | | | | | | | | | | | | | | | if it is a UUID. The function is osIsUUID(). Thanks SignpostMarv!
* | | Merge branch 'avination' into careminsterMelanie2012-07-201-1/+1
|\ \ \ | | |/ | |/|
| * | Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-191-1/+0
| | | | | | | | | | | | back)
| * | kick gitUbitUmarov2012-07-191-0/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-193-21/+43
|\ \ \ | |/ / |/| / | |/ | | | | | | | | 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
| * Stop the 15 second initial script compile wait if a script is being rezzed ↵Justin Clark-Casey (justincc)2012-07-181-0/+4
| | | | | | | | on a previously empty region.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-172-6/+24
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-172-6/+24
| | |\
| | | * Make the scrpt running flag work properlyMelanie2012-07-172-6/+24
| | | |
| * | | Revert "Revert "refactor: make llGiveInventory() use existing ↵Justin Clark-Casey (justincc)2012-07-171-24/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetInventoryItem() method rather than iterate through TaskInventory itself."" This reverts commit 59a29f5f221a1ffe4e22c63ef9da82270442b213. The original revert was committed by mistake - it turns out this was not the cause of Mantis 6089 Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix regression where llGiveInventory() had stopped asking non-owner ↵Justin Clark-Casey (justincc)2012-07-171-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | receivers to accept/decline. This appears to be a regression from back in commit db91044 (Mon Aug 22 2011) where we started to send TaskInventoryOffered msg dialog rather than InventoryOffered dialog. This is probably correct, but failed because the bucket was too large and because we wouldn't have handled the TaskInventoryDeclined option anyway. This patch handles both of these and make llGiveInventoryList() use TaskInventoryOffered as well Fixes http://opensimulator.org/mantis/view.php?id=6089
| * | Revert "refactor: make llGiveInventory() use existing GetInventoryItem() ↵Justin Clark-Casey (justincc)2012-07-171-11/+24
| |/ | | | | | | | | | | method rather than iterate through TaskInventory itself." This reverts commit 58b13d51a7eddb442e38e6dc6790a9e7cf68bad7.
* | Fix llSameGroup to work according to specsMelanie2012-07-181-10/+36
| |
* | Merge branch 'master' into careminsterMelanie2012-07-164-37/+0
|\ \ | |/
| * Revert "Fix script "Running" behavior"Melanie2012-07-164-37/+0
| | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | Merge branch 'avination' into careminsterMelanie2012-07-161-48/+35
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Allow setting linked avatar positions from within a prim not the one sat onMelanie2012-07-161-11/+18
| | |
| * | Reinstate older set rotation code for avatars since it works in all casesMelanie2012-07-151-22/+1
| | |
| * | Replace sit position and rotation code with older, working versionMelanie2012-07-151-26/+28
| | |
| * | Revert "Fix a sit rotation issue"Melanie2012-07-151-1/+1
| | | | | | | | | | | | This reverts commit 47f7cc9457bfc5c909290ac189b34dd3eceebe7f.
| * | Fix a sit rotation issueMelanie2012-07-151-1/+1
| | |
| * | Revert " lltargetomega efective spinrate now multiplied by gain ( need check )"Melanie2012-07-131-1/+0
| | | | | | | | | | | | | | | | | | | | | Undo figuring gain into spinrate in llTargetOmega. In SL, gain has null effect on nonphysical spinning objects. This reverts commit df55de5b3d88e241f35217d5c08d02b921991513.
* | | Merge branch 'master' into careminsterMelanie2012-07-161-1/+14
|\ \ \ | | |/ | |/|
| * | sending more user-friendly messages to the script error window rather than ↵SignpostMarv2012-07-161-1/+14
| | | | | | | | | | | | | | | | | | the thrown exceptions. Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'master' into careminsterMelanie2012-07-161-57/+78
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2024-09-20 15:36:33 +0000