aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'master' into careminsterMelanie2013-03-132-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * | | Make C# scripts return correct error line and column numbers instead of ↵Justin Clark-Casey (justincc)2013-03-131-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | failing because they have no linemap. Adapted fix from http://opensimulator.org/mantis/view.php?id=6571 Thanks Nickel Briand
| * | | minor: Remove mono compiler warnings from LSL_ApiHttpTestsJustin Clark-Casey (justincc)2013-03-111-1/+0
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-03-082-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | | Convert doubles passed back through the MOD interface into LSL_FloatsMic Bowman2013-03-051-0/+4
| | | |
| * | | Fix bug in osGetPrimitiveParams() so that it works for prims with the same ↵Justin Clark-Casey (justincc)2013-03-061-1/+1
| | |/ | |/| | | | | | | | | | | | | owner as the script and not ones with different owners. Addresses http://opensimulator.org/mantis/view.php?id=6560
* | | Merge branch 'avination' into careminsterMelanie2013-03-062-2/+6
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| | |
| * | Add support for void return typeroot2013-03-031-1/+5
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-03-033-7/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Remove osParseJSONNew because it's "object" return type is not useful for LSLroot2013-02-253-7/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-286-25/+301
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | Fix potential concurrency issue since the LSL notecard cache was not being ↵Justin Clark-Casey (justincc)2013-02-281-7/+10
| | | | | | | | | | | | checked for expiry under lock
| * | Fix bug where simultaneous calls by different scripts to llGetNotecardLine() ↵Justin Clark-Casey (justincc)2013-02-281-12/+14
| | | | | | | | | | | | | | | | | | | | | or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event. This was because the notecard asset ID was being used as the request identifier. Now using a random ID, in common with other code using the DataServer
| * | Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-283-3/+273
| | |
| * | Removed duplicate 'using' statement.Diva Canto2013-02-271-1/+0
| | |
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-271-2/+4
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-274-2/+252
| |\ \
| * | | Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-271-2/+2
| | | | | | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | | | Merge branch 'master' into careminsterMelanie2013-02-273-2/+251
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | | minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-272-2/+1
| | | |
| * | | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-271-0/+250
| | | | | | | | | | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b
* | | | Merge branch 'master' into careminsterMelanie2013-02-271-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-0/+1
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-231-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-221-2/+2
| | | | | | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* | | Merge branch 'master' into careminsterMelanie2013-02-225-6/+14
|\ \ \ | |/ /
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-211-2/+10
| | | | | | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-194-4/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-141-2/+7
|\ \ \ | |/ /
| * | Fix a very unlikely-to-occur NullReferenceException race condition in ↵Justin Clark-Casey (justincc)2013-02-141-2/+7
| | | | | | | | | | | | llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it
* | | Merge branch 'master' into careminsterMelanie2013-02-123-4/+13
|\ \ \ | |/ /
| * | Use an integer when specifying the XWorkItem wait rather than a TimeSpan to ↵Justin Clark-Casey (justincc)2013-02-123-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid a Windows casting issue in SmartThreadPool for large TimeSpans. TimeSpan.Milliseconds is an int64. However, STP casts this to an int (32-bit). If TimeSpan.MaxValue is given then the casting results in an invalid value for the SDK WaitHandle.WaitAll() call. This was causing the co-op script termination regression tests to fail on Windows but not Mono 2.10.8 (which is perhaps not strict in the negative values that it accepts). Solution here is to use the int millisecondsTimeout STP call rather than the TimeSpan one. This also allows us to more clearly specify Timeout.Infinite rather than TimeSpan.MaxValue Thanks to Teravus for this spot.
| * | Rename "Bounciness" to "Restitution"Melanie2013-02-071-1/+1
| | |
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-062-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-7/+9
|\ \ \ | | |/ | |/|
| * | Rename Bounciness to RestitutionMelanie2013-02-071-2/+2
| | |
| * | Make scripts shout a error but not stop when button count is overrun on llDialogMelanie2013-02-051-7/+9
| | |
* | | Rename Bounciness to RestitutionMelanie2013-02-071-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-061-89/+15
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | refactor: Move functions that lookup asset ids from task inventory or pass ↵Justin Clark-Casey (justincc)2013-02-061-89/+15
| | | | | | | | | | | | | | | | | | | | | them through to ScriptUtils class in OpenSim.Region.Framework.dll Renames functions to better reflect what they do. This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
* | | Merge branch 'master' into careminsterMelanie2013-02-058-9/+69
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Fix bug where viewers would not see the "Module command functions not ↵Justin Clark-Casey (justincc)2013-02-051-2/+62
| | | | | | | | | | | | | | | | | | enabled" error if these were disabled and a viewer attempted to call one. This was not working because the shouter was wrongly signalled as an agent rather than a prim
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-057-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | | Merge branch 'master' into careminsterMelanie2013-02-041-1/+1
|\ \ \ | |/ /
| * | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-021-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-313-25/+172
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | Fix issue where lsl -> c# generation in co-operative termination mode did ↵Justin Clark-Casey (justincc)2013-01-302-22/+171
| | | | | | | | | | | | | | | | | | | | | not correctly handle single statement versions of for, while and do-while loops. Add regression tests to validate the fix. This problem will not affect the default abort termination mode.
| * | minor: remove EnableLogging() left over in CoopTerminationTestsJustin Clark-Casey (justincc)2013-01-291-1/+1
| | |
| * | minor: remove some mono compile warnings in XEngine.csJustin Clark-Casey (justincc)2013-01-291-2/+0
| | |
generated by cgit v1.1 at 2024-12-21 09:36:06 +0000