ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-16 19:56:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,835 Commits 5 Branches 93 Tags
caa19862fa9a26bc5ee53e220565f99fc4084f33
Commit Graph

256 Commits

Author SHA1 Message Date
Melanie
caa19862fa Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-07 00:51:59 +00:00
Justin Clark-Casey (justincc)
98251cdab3 Add sensor, dataserver requests, timer and listener counts to "xengine status" command. 
This is for diagnostic purposes.
 2012-03-06 23:21:17 +00:00
Melanie
37049180f6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-02-07 21:09:04 +00:00
Justin Clark-Casey (justincc)
038d1bf742 Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). 
The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
 2012-02-07 17:44:37 +00:00
Melanie
16aa00e944 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-02-01 10:08:45 +00:00
Justin Clark-Casey (justincc)
99e71222f0 Lay out script status in property per row format, since getting too long for console lines. 2012-02-01 00:27:42 +00:00
Justin Clark-Casey (justincc)
e3680f216e Add count of events queued for a particular script in "scripts show" console command 2012-02-01 00:17:02 +00:00
Justin Clark-Casey (justincc)
8b3da1bff4 Make script console commands only show for selected region. 2012-02-01 00:10:07 +00:00
Justin Clark-Casey (justincc)
437de6743c Implement "xengine status" console command to show various xengine stats 2012-02-01 00:07:06 +00:00
Melanie
43128c9016 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-14 06:09:19 +00:00
Justin Clark-Casey (justincc)
82f0e19349 Extend scripts show command to accept a single item UUID parameter to display one script's status 
Usage is now scripts show [<script-item-uuid>]
 2012-01-14 00:44:19 +00:00
Melanie
bdb5ac96d9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-11-19 22:39:15 +00:00
Justin Clark-Casey (justincc)
cacc028835 If the entire simulator is shutting down then don't bother to unload the scripts from the appdomain in XEngine. 
All the other actions (script state save, etc.) still occur.
This makes shutdown where there are many scripts vastly quicker.
 2011-11-17 21:03:08 +00:00
Melanie
b975cbcbed Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-10-27 18:14:38 +01:00
Justin Clark-Casey (justincc)
40bee97015 For now, comment out error message on new script engine console commands. 
This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine
 2011-10-27 03:01:27 +01:00
Melanie
635b1bf18e Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge 2011-10-25 03:16:40 +01:00
Melanie
85d40ce1d1 Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-10-25 03:16:26 +01:00
Melanie
df430d572d Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-10-25 03:10:54 +01:00
Melanie
1bb0e3c800 Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-10-25 03:07:25 +01:00
Melanie
1ec82bb000 Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2011-10-25 03:06:18 +01:00
Melanie
89e973805d Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge 2011-10-25 02:57:01 +01:00
Melanie
69b480770a Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-10-25 01:50:55 +01:00
Melanie
8e69dde397 Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-10-25 01:36:39 +01:00
Justin Clark-Casey (justincc)
601dabb1b7 Extend scripts stop/start/suspend/resume console commands to allow action on a single script by giving the script item id (which can be found via scripts show). 
Not an ideal way to do this on a region with many scripts.  Needs refinement later.
 2011-10-19 22:30:31 +01:00
Justin Clark-Casey (justincc)
32c3faedd6 Add "scripts stop" and "scripts start" console commands. 
These will stop all running scripts and start all stopped scripts respectively.
A stopped script does not save any events for later processing.
 2011-10-19 21:40:28 +01:00
Justin Clark-Casey (justincc)
f836710af5 minor: improve command help on scripts suspend/resume 2011-10-19 21:34:55 +01:00
Justin Clark-Casey (justincc)
5607fd3af8 Fix resume scripts. 
On resume, we need to place requeue the script for event processing if there are any events on the queue.
Also need to do this under m_Script lock in order to avoid a race
 2011-10-19 21:30:37 +01:00
Justin Clark-Casey (justincc)
3cf7fb4eca Add "scripts suspend" and "scripts resume" commands. 
These aim currently to suspend and resume all scripts.
However, resume isn't currently working due to what looks like a bug in resume functionality itself.
 2011-10-19 20:53:24 +01:00
Justin Clark-Casey (justincc)
b45219065c on log and "show scripts" messages, show script item UUID rather than asset UUID 
The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
 2011-10-19 20:26:05 +01:00
Justin Clark-Casey (justincc)
116fbe8258 add current script status to "scripts show" command (running, suspended, etc.) 2011-10-19 20:24:07 +01:00
Justin Clark-Casey (justincc)
ecad9f9fd5 Add "show scripts" command to show all scripts currently known to the script engine in the current region. 
Also added synonym of "scripts show"
 2011-10-19 20:09:02 +01:00
Justin Clark-Casey (justincc)
ee84c0589c Don't execute rest of code in XEngine.RemoveRegion() and Close() if the module is disabled. 2011-10-14 01:06:43 +01:00
Justin Clark-Casey (justincc)
ea7366ddc6 When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting. 2011-10-12 19:42:04 +01:00
Tom
5484c9b585 Bring us up to date. 2011-09-14 19:11:32 -07:00
Justin Clark-Casey (justincc)
00f8946bd4 minor: if the script engine fails to find a prim for a script, also print out that prim's local id in the error message. 2011-09-12 22:44:14 +01:00
Oren Hurvitz
1dd904b78e Delay loading scripts until the scene has finished loading 2011-09-09 23:01:05 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
7eca929686 Eliminate pointless checks of SOG.RootPart != null 
It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized
 2011-09-01 02:11:00 +01:00
Justin Clark-Casey (justincc)
095b3e5756 Remove pointless cluttering SOP.ParentGroup != null checks. 
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
 2011-09-01 01:22:28 +01:00
Justin Clark-Casey (justincc)
cf3ffe5bb4 Fix llAttachToAvatar() 
Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay.
So we now don't do this.  The state will be serialized anyway when the avatar normally logs out.
The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state.
 2011-08-24 20:49:23 +01:00
Melanie
61d4291da5 Create a method to force the script engine to save state from outside 2011-05-24 03:17:12 +01:00
Melanie
d5841e07c2 Create a method to force the script engine to save state from outside 2011-05-24 02:40:59 +02:00
Melanie
be1996f121 Merge branch 'master' into careminster-presence-refactor 2011-05-22 20:23:25 +01:00
Justin Clark-Casey (justincc)
bb9b317f15 Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead 2011-05-21 01:05:20 +01:00
Melanie
4beb0c9b9b Merge branch 'master' into careminster-presence-refactor 2011-05-05 09:49:10 +01:00
Diva Canto
d8ee0cbe1c First stab at cleaning up Caps. Compiles. Untested. 2011-04-30 09:24:15 -07:00
Melanie
c271bbcc8a Preserve the script running flag when copying an object. 2011-01-08 16:44:28 +01:00
Melanie
efc555ca22 Actually set the PrivateBinPath in XEngine so relocating the scripts 
directory works
 2010-10-16 10:50:07 +02:00
Melanie
6f689f591a Merge Master 2010-09-26 17:56:31 +01:00
BlueWall
4f25b73b57 Add configurable path to script engine assemblies 
Adding ability to place script engine assemblies outside
	the codebase directories.

	Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"

Signed-off-by: Melanie <melanie@t-data.com>
 2010-09-26 02:30:46 +01:00