ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 22:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,681 Commits 5 Branches 93 Tags
d3892bbd0674e4f6912ce89e54712ea405dbbfb8
Commit Graph

2058 Commits

Author SHA1 Message Date
Melanie
d3892bbd06 Merge branch 'master' into careminster 
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
 2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
562067eb16 Fix bug where viewers would not see the "Module command functions not 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
 2013-02-05 02:09:21 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.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.
 2013-02-05 00:23:17 +00:00
Melanie
7482ad1c22 Merge branch 'master' into careminster 2013-02-04 19:21:39 +00:00
Justin Clark-Casey (justincc)
2ff301ca11 Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom 2013-02-02 01:34:49 +00:00
Melanie
9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
Justin Clark-Casey (justincc)
5ac84a3793 Fix issue where lsl -> c# generation in co-operative termination mode did 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.
 2013-01-30 03:52:22 +00:00
Justin Clark-Casey (justincc)
ccdf86c737 minor: remove EnableLogging() left over in CoopTerminationTests 2013-01-29 04:35:05 +00:00
Melanie
8f949513fd Merge branch 'master' into careminster 2013-01-26 16:58:02 +00:00
Talun
ceabb1b49a Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParams 
Correction so that scripts can turn Flexi off as well as on.
 2013-01-26 02:55:24 +00:00
Melanie
0b8bf69470 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2013-01-25 00:10:32 +00:00
Melanie
c6e6614a44 Merge branch 'avination' into careminster 2013-01-24 23:25:38 +00:00
Melanie
789e9901dd Make llGiveMoney async again. The return value is now the constant 1 to make 
scripts work properly. Scripts will no longer receive a failure indication through
this return value;
 2013-01-24 21:32:25 +01:00
Melanie
e785242c49 Reintroduce the return value of llGiveMoney. The grid will crash and burn without it. 2013-01-24 18:23:39 +01:00
teravus
878df52515 * This makes the non-physics llCastRay 'better'. It's not 'correctly working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray. 2013-01-23 21:58:51 -05:00
Justin Clark-Casey (justincc)
f7feed4d44 Remove unnecessary System.Linq reference from Compiler.cs 
Hopefully will fix windows build via compile.bat
 2013-01-24 01:11:04 +00:00
Justin Clark-Casey (justincc)
b775761104 Disable the not very useful infinite recursion co-op termination tests for 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
 2013-01-24 00:31:42 +00:00
Melanie
2ce4a758e2 Merge branch 'master' into careminster 2013-01-24 00:27:00 +00:00
Melanie
be4c8c4931 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2013-01-24 00:25:08 +00:00
Justin Clark-Casey (justincc)
1a610f30d8 Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call deprecated in later .net versions 2013-01-24 00:23:12 +00:00
Justin Clark-Casey (justincc)
55c6753b13 Merge branch 'master' into cooptermination 2013-01-24 00:03:44 +00:00
Justin Clark-Casey (justincc)
8a22ac3f94 Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs. 
APIs don't need to reference any methods on EventWaitHandle
 2013-01-23 23:38:08 +00:00
Justin Clark-Casey (justincc)
72dd3633ee Improve logging by making it clearer which script is failing if an assembly fails to load. 
Moves the noise co-op start/stop debug log messages to only display if xengine debug level >= 1
Logs which stop strategy is being used (abort or co-op)
Adjusts some other logging to remove not very useful stuff
 2013-01-23 23:34:15 +00:00
Melanie
c1795ed399 Add the Avination physics raycast glue so Core Physics can implement raycast 2013-01-23 21:03:24 +00:00
Melanie
dd6ddcc7a5 Prevent double ground collisions and prefer the physics result if there is one. 
ODE is known to not see the ground sometimes on raycast so the double test is
needed.
 2013-01-23 20:58:47 +01:00
Melanie
6a2b673fca Remove the return value from llGiveMoney and add llTransferLindenDollars. Also 
make llGiveMoney async so the script thread is not held up waiting for comms
to an external server.
 2013-01-23 19:45:36 +00:00
Melanie
fc1c77b42d Merge branch 'avination' into careminster 2013-01-23 19:31:27 +00:00
Melanie
c75508ec8d Fix a type (Suports => Supports). Also put the normal terrain collision check 
into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
 2013-01-23 20:29:05 +01:00
Melanie
47f18caa22 Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and 
make the function async so the script thread is not held up waiting for comms
to an external server.
 2013-01-23 18:58:29 +01:00
Melanie
f667428283 Guard against XMLRPC module ref being null, which will happen if it's disabled 2013-01-23 16:11:37 +01:00
Justin Clark-Casey (justincc)
cf168194e5 If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then continue to generate C# that is functionality identical to historical generation 
This is to eliminate disruption until co-op termination has been well-tested.
In non co-op mode, XEngine will continue to load DLLs of the existing Script class and the new XEngineScript class.
Moving to co-op mode still requires existing script DLL deletion to force recompilation, either manually or by setting DeleteScriptsOnStartup = true for one run.
This change also means that scripts which fail to initialize do not still show up as running scripts.
 2013-01-23 02:36:43 +00:00
teravus
6007eae00f Merge remote-tracking branch 'remotes/origin/avination' into teravuswork 2013-01-21 21:34:49 -05:00
Justin Clark-Casey (justincc)
9a4914e58c Add co-op termination regression test for infinite recursive manual call on event function. 
Such code would normally terminate quickly with a stack overflow exception anyway.
 2013-01-22 02:32:40 +00:00
Justin Clark-Casey (justincc)
0727784186 Set script delay factor to 0 in co-op termination tests 
This is to ensure loops aren't actually terminating from a wait on an LSL function.
This was not the case with any of the existing tests.
 2013-01-22 02:26:04 +00:00
Justin Clark-Casey (justincc)
679dc811dd Add regression test for co-op termination on infinite user function call regression. 
Such a script would probably run out of stack pretty quickly anyway.
 2013-01-22 02:22:58 +00:00
Justin Clark-Casey (justincc)
b93e8020e2 Add regression test for co-op stop of an infinite jump loop 
Also fixes bug in do-while test
Improves detection of failure due to invalid script in test
Sets up xengine anew for each test rather than once for the while testsuite to improve isolation between tests.
Stop listening for chat after the first 'script is running' chat is received to reduce test run time.
 2013-01-22 02:16:10 +00:00
Justin Clark-Casey (justincc)
cf0b5e4f27 Add do-while co-op termination test 
Minor changes to scripts in other tests.
 2013-01-22 01:53:10 +00:00
Justin Clark-Casey (justincc)
fbdfe43d75 Add single and comound while loop co-op termination test 2013-01-22 01:40:18 +00:00
Justin Clark-Casey (justincc)
c6ba27d096 Fix bug in generating termination checks in compound statement for loop. 
Add regression test for this case.
 2013-01-22 01:23:10 +00:00
Justin Clark-Casey (justincc)
a558f9797d factor out common code in existing co-op termination regression tests 2013-01-22 01:13:45 +00:00
Justin Clark-Casey (justincc)
419f8e0f76 Increase WaitForEventCompletionOnScriptStop to 120 secs to show that the co-op setting is active in its regression tests. 2013-01-22 01:08:24 +00:00
Justin Clark-Casey (justincc)
cd446c32d6 Add regression test TestStopOnLongForLoop() 2013-01-22 00:59:46 +00:00
Robert Adams
95c53ecae7 Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenter 
routines on the physics engine. Won't make a difference for any
existing scripts since ODE always returned Vector3.Zero.
 2013-01-21 15:55:54 -08:00
teravus
09a3e134e4 * Fix notecard loading - If the notecard name is formatted like a UUID but isn't an actual asset UUID, then try to load it like an asset id first, then try to load it as a task inventoryitem name. If the passed UUID is a string, try to load it like a task inventory item name. 2013-01-21 17:30:38 -05:00
Melanie
903cc71f0d Remove an extra ScriptSleep (merge artefact) from llSetLinkPrimitiveParamsFast 2013-01-19 22:53:51 +01:00
Melanie
2d3a57a002 Merge branch 'avination' 
Conflicts:
	OpenSim/Framework/ThrottleOutPacketType.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
 2013-01-19 21:49:33 +01:00
Melanie
12efac494a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
 2013-01-19 02:38:04 +00:00
Talun
27e2ec177a New constants for llGetObjectDetails 
New constants for llGetObjectDetails OBJECT_CHARACTER_TIME,
OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE,
OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ
also Pathfining constants, 3 of which are used by llGetObjectDetails
 2013-01-19 01:50:16 +00:00
Talun
4f70e423df Mantis 6507 keys returned by llGetAgentList incorrect for llList2Key 
The type of the keys returned by llGetAgentList corrected to LSL_Key
 2013-01-19 01:14:11 +00:00
Justin Clark-Casey (justincc)
74256c0cc4 Restore previous client AO behaviour by not allowing them to remove the default animation but continue to allow scripts to do so. 
This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327
and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483
Animations may still exhibit different behaviour if both scripts and clients are adjusting animations.
A change in the behaviour of client AO to not remove all animations may be a better long term approach.
 2013-01-18 22:57:09 +00:00