aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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-224-5/+13
|\ \ \ | |/ /
| * | 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-193-3/+3
| | |
* | | 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-121-2/+2
|\ \ \ | |/ /
| * | Use an integer when specifying the XWorkItem wait rather than a TimeSpan to ↵Justin Clark-Casey (justincc)2013-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-057-8/+68
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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-056-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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-312-23/+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
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-261-3/+10
|\ \ \ | |/ /
| * | Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParamsTalun2013-01-261-3/+10
| | | | | | | | | | | | Correction so that scripts can turn Flexi off as well as on.
* | | Merge branch 'master' into careminsterMelanie2013-01-252-5/+17
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-231-4/+17
| | | | | | | | | | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
| * | Remove unnecessary System.Linq reference from Compiler.csJustin Clark-Casey (justincc)2013-01-241-1/+0
| | | | | | | | | | | | Hopefully will fix windows build via compile.bat
* | | Merge branch 'avination' into careminsterMelanie2013-01-243-12/+26
|\ \ \ | | |/ | |/|
| * | Make llGiveMoney async again. The return value is now the constant 1 to makeMelanie2013-01-241-8/+10
| | | | | | | | | | | | | | | scripts work properly. Scripts will no longer receive a failure indication through this return value;
| * | Reintroduce the return value of llGiveMoney. The grid will crash and burn ↵Melanie2013-01-243-12/+12
| | | | | | | | | | | | without it.
| * | Prevent double ground collisions and prefer the physics result if there is one.Melanie2013-01-231-3/+15
| | | | | | | | | | | | | | | ODE is known to not see the ground sometimes on raycast so the double test is needed.
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-8/+8
| | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | Merge branch 'master' into careminsterMelanie2013-01-242-2/+7
|\ \ \ | | |/ | |/|
| * | Disable the not very useful infinite recursion co-op termination tests for ↵Justin Clark-Casey (justincc)2013-01-241-2/+6
| | | | | | | | | | | | | | | | | | now as they appear to cause failures with testing in jenkins. These tests are not very useful anyway as they never actually get a chance to try termination before the script runs out of stack
| * | Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call ↵Justin Clark-Casey (justincc)2013-01-241-0/+1
| | | | | | | | | | | | deprecated in later .net versions
* | | Merge branch 'master' into careminsterMelanie2013-01-249-114/+465
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-245-51/+288
| |\ \
| | * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-13/+77
| | | |
| | * | Remove the return value from llGiveMoney and add llTransferLindenDollars. AlsoMelanie2013-01-233-33/+114
| | | | | | | | | | | | | | | | | | | | make llGiveMoney async so the script thread is not held up waiting for comms to an external server.