aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-192-20/+22
|\ | | | | | | | | | | | | | | 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
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-171-6/+8
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-171-6/+8
| | |\
| | | * Make the scrpt running flag work properlyMelanie2012-07-171-6/+8
| | | |
| * | | 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-162-20/+0
|\ \ | |/
| * Revert "Fix script "Running" behavior"Melanie2012-07-162-20/+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
| * | acting on feedback from justinccSignpostMarv2012-07-141-6/+7
| | |
| * | acting on feedback from justinccSignpostMarv2012-07-141-39/+42
| | |
| * | added in some extra variables, it sometimes thinks it is on the same parcel :(SignpostMarv2012-07-141-5/+7
| | | | | | | | | | | | Signed-off-by: SignpostMarv <github@signpostmarv.name>
| * | adding workaround for silent failure if position is outside the bounds of a ↵SignpostMarv2012-07-141-13/+41
| | | | | | | | | | | | | | | | | | region, implementing parcel prim count check. Signed-off-by: SignpostMarv <github@signpostmarv.name>
| * | Implementation of llSetRegionPos(). Does not implement failure on object ↵SignpostMarv2012-07-143-4/+45
| | | | | | | | | | | | | | | | | | entry/prim limit/access restrictions. Signed-off-by: SignpostMarv <github@signpostmarv.name>
* | | Merge branch 'master' into careminsterMelanie2012-07-132-7/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-131-1/+1
| | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
| * | Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-121-6/+2
| | | | | | | | | | | | IClientAPI.RemoteEndpoint.
* | | Merge branch 'master' into careminsterMelanie2012-07-126-32/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-114-24/+14
| | | | | | | | | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
| * | Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-112-8/+15
| | | | | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | | Merge branch 'avination' into careminsterMelanie2012-07-111-8/+25
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | remove expensive and leaked ( in Xengine at least) SayShout timer andUbitUmarov2012-07-111-5/+23
| | | | | | | | | | | | | | | replace it by a simpler function that should do the same (?) (don't like much those 10 + 1 bursts)
| * | lltargetomega efective spinrate now multiplied by gain ( need check )UbitUmarov2012-07-101-0/+1
| | |
| * | more work on llSetAngularVelocity()UbitUmarov2012-07-101-3/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-116-16/+148
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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
| * | Disable logging in regression test in OSSL_ApiAttachmentTestsJustin Clark-Casey (justincc)2012-07-101-1/+1
| | |
| * | This script allows an object to be attached directly from prim inventory to ↵Justin Clark-Casey (justincc)2012-07-094-5/+96
| | | | | | | | | | | | | | | | | | | | | another avatar in the scene. Very useful in serious game/environment scenarios where its only allowed for trusted creators. Threat level Severe
| * | minor: remove some recent mono compiler warningsJustin Clark-Casey (justincc)2012-07-071-1/+1
| | |
| * | Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-072-10/+10
| | | | | | | | | | | | | | | 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.
| * | Mantis 6063 osNpcTouch.Talun2012-07-063-0/+41
| | | | | | | | | | | | Allow NPCS to touch obects.
* | | Merge branch 'avination' into careminsterMelanie2012-07-063-46/+191
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | added llSetVelocity. will refuse to work on vehicles and on attachments ( ↵UbitUmarov2012-07-063-1/+29
| | | | | | | | | | | | this last may need fix) added also some code for llSetAngularVelocity but not working still
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-051-1/+1
| | | | | | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before.
| * | Implement the buggy version of llXorBase64Strings() for compatibility's sakeMelanie2012-07-021-3/+84
| | |
| * | Bring casing of llSHA1String in line with SLMelanie2012-07-011-1/+1
| | |
| * | don't recoil attachments doing llRezObject()UbitUmarov2012-06-291-2/+8
| | |
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-06-291-0/+2
| |\ \
| * | | reactivate physics raycasts on llCastRay() until it's clear what is its ↵UbitUmarov2012-06-281-1/+1
| | | | | | | | | | | | | | | | problem if any...
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-06-282-3/+4
| |\ \ \
generated by cgit v1.1 at 2024-10-25 11:30:20 +0000