aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
|\ \ \ | | |/ | |/|
| * | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-1/+1
| | | | | | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly.
* | | Merge branch 'master' into careminsterMelanie2012-09-101-4/+4
|\ \ \ | | |/ | |/|
| * | passing in the function name to MOD_Api.ConvertFromLSL for more ↵SignpostMarv2012-09-101-4/+4
| | | | | | | | | | | | user-friendly error messages
* | | Merge branch 'master' into careminsterMelanie2012-09-092-11/+11
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵SignpostMarv2012-09-082-10/+10
| | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
| * | 4096 is used in various places as the maximum height of a region, ↵SignpostMarv2012-09-081-1/+1
| | | | | | | | | | | | refactoring to be a constant
* | | Merge branch 'master' into careminsterMelanie2012-09-075-3/+266
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | Enables cast from int to float for MOD* functions;Mic Bowman2012-09-051-1/+1
| | | | | | | | | | | | Thanks SignpostMarv!
| * | wrapping attachment functions in a regionSignpostMarv2012-09-043-2/+4
| | |
| * | Implementing functing to send messages directly to attachmentsSignpostMarv2012-09-044-0/+201
| | |
| * | refactoring the grunt work of MessageObject into a private method with a ↵SignpostMarv2012-09-041-0/+5
| | | | | | | | | | | | UUID argument
| * | implementing a function to get the number of attachments wornSignpostMarv2012-09-043-0/+55
| | |
| * | Revert "made setting rotation match Second Life"Melanie2012-09-031-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | Second Life seems to have introduced a bug, as we have confirmation that SL behavior changed recently and changed in contradiction to their stated intention This appears to be another of the bugs SL is notorious for. Signpost and I have decided to back this out until SL's intention becomes clear. This reverts commit f7b88d1c40ba06c62491d8d32809fe6c1c4d360d.
| * | Revert "no need to assign rotation to a variable now"Melanie2012-09-031-1/+2
| | | | | | | | | | | | This reverts commit a3d140b57c5e2ae0f3334d59b82e116d40199b49.
| * | Revert "formatting"Melanie2012-09-031-2/+2
| | | | | | | | | | | | This reverts commit fb211c64fd9d335f4879549023870b1e28416f74.
* | | Revert "made setting rotation match Second Life"Melanie2012-09-031-1/+32
| | | | | | | | | | | | This reverts commit f7b88d1c40ba06c62491d8d32809fe6c1c4d360d.
* | | Revert "no need to assign rotation to a variable now"Melanie2012-09-031-1/+2
| | | | | | | | | | | | This reverts commit a3d140b57c5e2ae0f3334d59b82e116d40199b49.
* | | Revert "formatting"Melanie2012-09-031-2/+2
| | | | | | | | | | | | This reverts commit fb211c64fd9d335f4879549023870b1e28416f74.
* | | Merge branch 'master' into careminsterMelanie2012-09-031-44/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | formattingSignpostMarv2012-09-031-2/+2
| | |
| * | no need to assign rotation to a variable nowSignpostMarv2012-09-031-2/+1
| | |
| * | made setting rotation match Second LifeSignpostMarv2012-09-031-32/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-311-1/+1
|\ \ \ | |/ /
| * | Implementing a vastly simpler means of allowing region modules to access ↵SignpostMarv2012-08-311-1/+1
| | | | | | | | | | | | GetLinkParts than mantis 6236
* | | Merge branch 'master' into careminsterMelanie2012-08-314-12/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs