ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-20 15:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,653 Commits 5 Branches 93 Tags
b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4
Commit Graph

3374 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
d0a2ea0857 Fix regression where the stored state of every second script in an object rezzed from inventory (e.g. attachments) was no longer loaded. 
Likely a regression since f132f642 (2014-08-28)
Relates to http://opensimulator.org/mantis/view.php?id=7278
 2015-01-23 00:27:57 +00:00
Justin Clark-Casey (justincc)
2995868176 Make XEngine.SaveAllState() actually do this instead of script maintenance 2015-01-17 00:05:13 +00:00
Justin Clark-Casey (justincc)
0eb268e265 minor: remove old commented out objectRemoved bool in XEngine.OnRemoveScript() 2015-01-16 23:59:08 +00:00
Justin Clark-Casey (justincc)
58f7efc41a Add clearqueue code adjustment that should have been in previous commit faaf47a 2015-01-16 23:57:51 +00:00
Justin Clark-Casey (justincc)
faaf47a86f Prevent a race condition between the script engine backup thread and script removal by locking on the script's EventQueue and only proceeding if it's flagged as still running. 
Relates to http://opensimulator.org/mantis/view.php?id=7407
 2015-01-16 23:55:11 +00:00
Justin Clark-Casey (justincc)
8d724e90de For scripts in attachments, don't save .state files apart from the initial one as these are ignored since .state is saved in the attachment's asset. 
This eliminates pointless work and exceptions when an appdomain is unloaded whilst an attachment script state is persisted.
Adds test for this case.
Relates to http://opensimulator.org/mantis/view.php?id=7407
 2015-01-16 22:46:48 +00:00
Justin Clark-Casey (justincc)
dbd500db42 minor: Add event name to existing debug output when a script event fails with an exception. To aid debugging. 2015-01-08 22:59:29 +00:00
Diva Canto
2138d5c7f8 Renamed VERSION_NUMBER to VersionNumber 2014-12-30 15:27:28 -08:00
Diva Canto
7466ef0525 This cleans up versioning. Specifically: 
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions

It also eliminates the last addin.xml files that were still there, for consistency.
 2014-12-30 12:53:31 -08:00
Diva Canto
89c1ac4cff Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number doesn't need to match the release version number, but I think it's a very good idea that they do. 2014-12-29 15:05:44 -08:00
Justin Clark-Casey (justincc)
147d401b28 Remove XEngine.m_uniqueScripts 
This provides no obvious benefit as far as I can tell but has a definite cost in keep script strings in memory for the entire simulator session.
 2014-12-15 20:38:26 +00:00
Justin Clark-Casey (justincc)
2b9f0647de Fix a regression where objects crossing regions in the same simulator (on their own or as attachments) with AppDomainLoading = false would create the new state in the source region area rather than the dest. 
This was beause the code was finding the script DLL compiled for the source region as everything is in the same appdomain and using this as the location for the destination script state, etc.
This resolves the regression by passing the proper destination separately from the DLL retrieved.
Probably a regression since commit d7b92604 (11 July 2014).
Added regression test for this case.
At least partly addresses http://opensimulator.org/mantis/view.php?id=7278
 2014-12-10 00:25:27 +00:00
Justin Clark-Casey (justincc)
227d2e2b61 Avoid a possible race condition where the XEngine script compile thread could complete but see OnRezScript() insert a new job and complete before it set m_CurrentCompile = null 
If the above happened, it would mean the new script would not compile until some  script was added for compilation.
 2014-12-10 00:04:10 +00:00
Justin Clark-Casey (justincc)
76722d8324 In XEngine, enqueue a script rez to the compile queue after setting m_CompileDict to avoid a rare but not impossible race condition. 2014-12-09 23:59:19 +00:00
Justin Clark-Casey (justincc)
d34ad345d5 minor: If we are recompiling scripts in response to a ScriptStopStrategy config change (a rare situation), then explicitly log this for debug purposes. 2014-12-03 21:08:43 +00:00
Justin Clark-Casey (justincc)
c3c05a8693 Reintroduce general xengine extra debugging log level. This can be controlled at runtime with the command "debug xengine log <level>", as with similar commands. 
If log level is 1 then every script load is logged.
This means the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section in OpenSim.exe.config is no longer needed to avoid log spam on regions with many scripts and can be removed.
 2014-12-03 20:48:17 +00:00
Justin Clark-Casey (justincc)
805b7ccb3e minor: improve logged error in XEngine.SetXmlState if there was a problem writing the linemap. 
The previous error report of already exists is inaccurate since existing files do get overwritten.
 2014-12-03 20:35:49 +00:00
Justin Clark-Casey (justincc)
72d1d96c5c Always close script linemap file after reading and always dispose of other streams in the script engine even if exceptions are thrown. 2014-12-03 20:31:09 +00:00
Justin Clark-Casey (justincc)
432f0e8783 Correct 690fe0c to actually log the exception reported in DoOnRezScriptQueue()(and now the scene name). 2014-11-29 15:04:16 +00:00
Justin Clark-Casey (justincc)
690fe0c5e5 If there are any exceptions in XEngine.DoOnRezScriptQueue() then log the error and always set m_CurrentCompile = null 
Setting m_CurrentCompile = null in the finally block reduces the risk that an exception could permanently stop any future scripts compiling until the simulator is restarted.
If an exception is seen from this then please report and further changes to fix the bug or improve compiling reliability can be made.
 2014-11-29 01:42:52 +00:00
Justin Clark-Casey (justincc)
55e064baf7 Remove minor race condition where two threads could race on fields such as m_ScriptFailCount as set in XEngine.DoOnRezScriptQueue() 2014-11-29 01:33:14 +00:00
Justin Clark-Casey (justincc)
86367d7219 refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class. 
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
 2014-11-25 23:56:32 +00:00
Justin Clark-Casey (justincc)
3a296a817b Fix compile error from previous 1d56029848e96016b5809f596619e32d0ebcc995 2014-11-25 23:23:11 +00:00
Justin Clark-Casey (justincc)
550cf714bc Fix issue where llRemoteLoadScriptPin() would treat 0 (the default) as a valid set pin in a destination prim rather than the unset no pin state 
Adds regression test for this case.
 2014-11-25 23:23:11 +00:00
Justin Clark-Casey (justincc)
ec8d21c434 Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis. 
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
 2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
336790e7b4 Add some more llGiveInventory() regression tests 2014-11-25 23:22:19 +00:00
Justin Clark-Casey (justincc)
fc878a33ed refactor: consistently put all test classes in the OpenSim.Tests.Common package rather than some in OpenSim.Tests.Common.Mock 
the separate mock package was not useful and was just another using line to always add
 2014-11-25 23:21:37 +00:00
Melanie Thielker
3a94e20d70 Merge branch 'ubitworkmaster' 2014-11-21 04:10:38 +01:00
Melanie Thielker
80118ac057 Remove braindead "fix" that messed up intersim scripted giving. 2014-11-21 04:00:52 +01:00
Cinder
cfaf904a3b LSL key should be implicitly cast to a boolean value 
Signed-off-by: James Hughes <jamesh@ascent.bluewallgroup.com>
 2014-11-20 11:32:46 -06:00
UbitUmarov
7bcb68d7c4 some steps to rez center or root of prim inventory object at requested 
position ( does nothing diferent still )
 2014-11-19 16:59:11 +00:00
UbitUmarov
07074d068b dont do recoil on llRezObject called from attachments, as seem to happen 
at sl
 2014-11-18 10:37:46 +00:00
UbitUmarov
140c0b3bb8 n llPushObject if pushed object is a avatar use its rotation, not pusher 
rotation
 2014-11-14 06:28:48 +00:00
Justin Clark-Casey
5aa8ba1b45 Fix issue where llRemoteLoadScriptPin() would treat 0 (the default) as a valid set pin in a destination prim rather than the unset no pin state 
Adds regression test for this case.
 2014-11-11 17:59:56 +00:00
UbitUmarov
382df37f80 remove some Xengine errors on scripted object delete 2014-10-22 10:21:54 +01:00
Justin Clark-Casey (justincc)
c8664e8907 Add some more llGiveInventory() regression tests 2014-10-16 19:54:40 +01:00
Justin Clark-Casey (justincc)
00b23e51ae Change name of just added OSSL osForceSit() to osForceOtherSit() 
This is somewhat more in keeping with something like osForceAttachToOtherAvatarFromInventory()
and potentially allows a separate osForceSit() command with High threat rather than VeryHigh that only sits the owner and can be enabled without enabling sit of other avatars.
 2014-10-11 00:14:35 +01:00
Justin Clark-Casey (justincc)
5acbbcb33f minor: spacing cleanup from previous commit 79a4d1ea 2014-10-11 00:10:49 +01:00
Vegaslon
79a4d1ea8d Implements osForceSit(string avatar) & overload osForceSit(string avatar, string target) 
Allows a script IN the target prim to force an avatar to sit on it using normal methods as if called by the client.

Overload method of osForceSit() to allow a script NOT in the target prim to force an avatar to sit on the target prim using normal methods as if called by the client.

This patch is based on previous work from
http://opensimulator.org/mantis/view.php?id=4492
and also includes the suggestions from justincc including change of threat level
Thank you Christos Lightling.
 2014-10-11 00:04:25 +01:00
Justin Clark-Casey (justincc)
29a05cdeb5 Change thread of osForceAttachToOvtherAvatarFromInventory to VeryHigh from Severe 
It fits much better in this category.
 2014-10-08 23:35:25 +01:00
Justin Clark-Casey (justincc)
cbd428cff3 Add LSL transaction_result event. 
This is cinderblocks' transaction_result.diff from http://opensimulator.org/mantis/view.php?id=7329 but I have used lsl.parser.cs and lsl.lexer.cs files generated directly from opensim-libs rather than those supplied in the patch.
I also added scriptEvents.transaction_reuslt.
The required parser/lexer generation file changes were made in commit d564f28 in the opensim-libs repo.
Thanks!
 2014-10-04 00:16:47 +01:00
UbitUmarov
6d2cdd31fe populate collision lists with LinkNumber, and detected structure in 
Xengine
 2014-09-23 23:59:05 +01:00
UbitUmarov
f95bb53371 remove LockItemsForRead(false) without previus call with true 2014-09-21 23:02:02 +01:00
Edward
427240f935 Changes to be committed: modified: OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs modified: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs This solves mantis bug# 5005: llRegionSay script does not trigger ChatFromWorld event. This was solved by adding World.SimChat() command to the llRegionSay() function (per suggestion of DrCuriosity). Additionally this fixes llRegionSayTo() which was also not functioning by adding a World.SimChat() command and adding a new SimChatToAgent() overrided function to Scene.PacketHandlers.cs This is the second patch revision. Corrections made to the position of World.SimChat() and removal of tabs per suggestion by justincc. 2014-09-17 23:37:18 +01:00
UbitUmarov
f66b58cf00 *TEST* add movement states SIT and SITGROUND. ScenePresence on SIT, 
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
 2014-09-10 19:30:57 +01:00
UbitUmarov
724d174a77 it its a default ( internal ) animation return its name in lower case 2014-09-09 23:36:10 +01:00
UbitUmarov
13cb6ef6ef remove the check animState == anim for same reasons 2014-09-09 23:30:31 +01:00
UbitUmarov
4842806ea8 look for animation on part inventory before default animations, so 
user can use same name. Search directly on default animations using
 uppercase.
 2014-09-09 23:22:36 +01:00
Melanie Thielker
87a4abac50 Plumb the rest of the serverside AO 2014-09-09 20:50:41 +02:00
Melanie Thielker
2d2823f1de Add some case magic and send an anim pack when an override is set 2014-09-09 20:16:02 +02:00