aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-261-2/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Separate LSL's notion of the default anim from the actually playing anims.Melanie2012-10-261-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-10-269-99/+365
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-264-0/+107
| | | | | | | | general-purpose function to see if a given string matches a given regex
| * Formatting and casing correction in WorldCommModule, trailing new line in ↵SignpostMarv2012-10-261-1/+1
| | | | | | | | OSSL to get git diff to not complain
| * minor: Add comment as to why we are pulcking plain old ints out of the ↵Justin Clark-Casey (justincc)2012-10-261-0/+2
| | | | | | | | LSL_List when converting values from LSL for modInvoke()
| * Removing the apparently superfluous explicit namespace reference so that the ↵SignpostMarv2012-10-261-8/+2
| | | | | | | | if-else-if-else block in ConvertFromLSL can have a consistent appearance
| * system ints can end up in LSL lists, which can cause counter-intuitive ↵SignpostMarv2012-10-261-0/+2
| | | | | | | | unknown list element type errors in ConvertFromLSL (via modInvoke)
| * Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if ↵Justin Clark-Casey (justincc)2012-10-252-11/+30
| | | | | | | | appearance notecard does not exist, rather than returning UUID.Zero or silently failing.
| * When scripts generate expected exceptions (e.g. due to checked bad ↵Justin Clark-Casey (justincc)2012-10-254-8/+48
| | | | | | | | | | | | | | parameter) throw ScriptException instead of just a plain old exception. This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests. No functional changes.
| * Make osNpcCreate() return UUID.Zero instead of throwing an exception if ↵Justin Clark-Casey (justincc)2012-10-253-12/+74
| | | | | | | | notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception.
| * Add TestOsNpcLoadAppearance()Justin Clark-Casey (justincc)2012-10-252-4/+45
| |
| * Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to ↵Justin Clark-Casey (justincc)2012-10-252-70/+69
| | | | | | | | | | | | OSSL_ApiNpcTests This is a more intuitive location.
* | Merge branch 'master' into careminsterMelanie2012-10-231-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/LandData.cs
| * Add CLICK_ACTION_ZOOMBlueWall2012-10-201-0/+1
| | | | | | | | Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
* | Merge branch 'master' into careminsterMelanie2012-10-201-5/+15
|\ \ | |/
| * altering documentation for llGetLinkName, as the current documentation is ↵SignpostMarv2012-10-191-1/+11
| | | | | | | | rather lengthy for a "summary".
| * since llGetLinkName has a "simplest case", it should be the first check made.SignpostMarv2012-10-191-4/+4
| |
| * the simplest case for llGetLinkName also applies to the LINK_THIS constantSignpostMarv2012-10-191-1/+1
| |
| * ensuring that operand order in llGetLinkName is internally consistentSignpostMarv2012-10-191-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-10-171-0/+4
|\ \
| * | Allow bypassing perms dialog (console only)Melanie2012-10-141-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-161-8/+23
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * | Add missing category paremeter to llGiveInventoryList grid IM construction.Justin Clark-Casey (justincc)2012-10-161-1/+1
| | | | | | | | | | | | | | | This was a regression from 16c9c1df Sat Oct 6 02:34:49 2012 +0100. Should resolve http://opensimulator.org/mantis/view.php?id=6360
| * | Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only ↵Justin Clark-Casey (justincc)2012-10-131-19/+25
| | | | | | | | | | | | | | | | | | performing HG regionflags service check if the region secret is not empty. An empty RegionSecret is never HG, whilst a non-empty one may be HG or being genuinely used as a RegionSecret.
| * | Now using region flags for llRequestSimulatorData DATA_SIM_POS.TBG Renfold2012-10-131-8/+17
| | | | | | | | | | | | | | | | | | If the region is not classed a hypergrid region, then the region secret is checked to make sure that it is a valid UUID. Just a temporary fix at this time.
* | | Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Correct osSetContentType() threat check to query osSetContentType rather ↵Justin Clark-Casey (justincc)2012-10-101-1/+3
| | | | | | | | | | | | than osSetResponseType
| * | Remove osDropAttachment threat level check wrongly placed in ↵Justin Clark-Casey (justincc)2012-10-101-1/+0
| | | | | | | | | | | | OSSL_Api.ShoutErrorOnLackingOwnerPerms.
* | | Merge branch 'master' into careminsterMelanie2012-10-071-9/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
| * | Fix a viewer crash issueMelanie2012-10-031-1/+12
| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | Merge branch 'avination' into careminsterMelanie2012-10-031-1/+12
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix a viewer crash issueMelanie2012-10-031-1/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-034-2/+136
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | correcting typoSignpostMarv2012-10-021-3/+3
| | |
| * | taking into account the recent introduction of implicit operatorsSignpostMarv2012-10-021-3/+1
| | |
| * | added perms checking, duplicated functionality to methods that do not ↵SignpostMarv2012-10-023-6/+86
| | | | | | | | | | | | require perms and have higher threat level
| * | fixing copypastaSignpostMarv2012-10-021-1/+1
| | |
| * | implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-023-2/+53
| | |
| * | Add money event routing to the script engine.Melanie2012-10-021-0/+3
| | |
| * | Send money() events to the clicked prim. Reverting a change I made over a ↵Melanie2012-10-021-1/+1
| | | | | | | | | | | | year ago.
* | | Merge branch 'avination' into careminsterMelanie2012-09-291-3/+10
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-281-23/+17
| |\ \
| * | | Fix a possible NREMelanie2012-09-281-3/+10
| | | |
* | | | Merge branch 'avination' into careminsterMelanie2012-09-271-23/+17
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Streamline and improve llGetMassMelanie2012-09-261-23/+17
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-09-242-8/+150
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Fix llListFindList() returning no match when there is a match with a script ↵Justin Clark-Casey (justincc)2012-09-222-8/+150
| | | | | | | | | | | | | | | | | | | | | | | | constant component in the source list. Adds regression test for this case. Based on http://opensimulator.org/mantis/view.php?id=6156 Thanks SignpostMarv.
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-1/+1
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2024-12-23 14:48:33 +0000