36e6edfc65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-01-26 00:44:32 +00:00
13d9b64b1d
Re-enable error logging associated with assembly and script loading failure in ScriptInstance.
...
Swallowing exceptions just leads to more mysterious failures later on.
2012-01-26 00:28:51 +00:00
46e1bcb6b6
minor: remove mono compiler warning
2011-11-26 01:40:46 +00:00
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
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
1ec82bb000
Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2011-10-25 03:06:18 +01:00
8e69dde397
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:36:39 +01:00
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
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
116fbe8258
add current script status to "scripts show" command (running, suspended, etc.)
2011-10-19 20:24:07 +01:00
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
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
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
15a514fcbc
refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar
...
This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP
2011-08-26 23:06:41 +01:00
fda56618e1
Deal with possibly un-initialized scripts in object transfers. Mantis #5310
2011-01-06 16:17:43 -08:00
8741676bc3
Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region.""
...
This reverts commit 6c01ebb875
2010-12-03 18:32:03 +01:00
6c01ebb875
Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region."
...
This reverts commit 2827deffe8
2010-12-03 04:39:51 +01:00
e05f728b08
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:08:12 +00:00
2827deffe8
Trigger changed event with CHANGED_TELEPORT when teleporting to another region.
2010-11-26 22:46:48 +01:00
87f30709a2
Merge branch 'master' into careminster-presence-refactor
2010-11-22 14:14:45 +00:00
8a2c365e5b
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
...
Fixes Mantix #5214 .
2010-11-22 10:39:46 +01:00
efc555ca22
Actually set the PrivateBinPath in XEngine so relocating the scripts
...
directory works
2010-10-16 10:50:07 +02:00
e1e897ac11
Change XEngine to use the new constant
2010-08-06 15:18:46 +01:00
120f3a18f2
Correct some script constants.
2010-08-06 15:11:18 +01:00
696c2c429b
Change XEngine to use the new constant
2010-08-06 15:33:22 +02:00
c5c6627adb
Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53 .
2010-08-06 02:40:31 -07:00
d2e4f2d376
Merge branch 'master' into careminster-presence-refactor
2010-04-19 15:33:20 +01:00
a89208b465
Stopgap measure. Disable the recent script startup changes until I can cure the
...
race condition.
2010-04-19 14:14:31 +01:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
28c7bb99bf
Merge branch 'master' into careminster
2009-12-22 09:30:50 +00:00
1876ce90af
FINALLY! Script compile errors now appear in the script error pane,
...
not in a funky debug window.
2009-12-22 09:24:01 +00:00
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
247c66b3fe
Swap the locking of m_EventQueue and m_Script to ease locks on script inventory operations
2009-11-23 20:25:53 +01:00
889ce36afa
Added some [DebuggerNonUserCode] modifiers to functions that throw EventAbortException() to ease debugging on Visual Studio
2009-11-23 17:59:24 +01:00
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
ec7fd8b1f8
More performance improvements to XEngine script loading
2009-10-29 06:42:40 -07:00
dd13fa361b
* Misc. formatting cleanup for the previous patch
...
* Added the new AppDomainLoading variable to the [XEngine] section in the example config
2009-10-29 05:56:37 -07:00
33448e4ba8
Optimizations
2009-10-29 05:39:18 -07:00
66923983a7
Add support for display of the script compilation errors in the script editor's
...
debug pane. This will still use DEBUG_CHANNEL currently, since it is not
fully implemented. This also removes the "Compiled successfully" message
that pops up in the viewer.
2009-10-17 22:36:44 +01:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
19c5c8b98d
fix to preserve UTF8 encoding in saved script state.
2009-09-14 16:14:59 +02:00
766d775625
remove warning
2009-09-06 20:17:30 +01:00
a851b68333
Remove one more sponsor reference
2009-08-14 14:27:56 +01:00
7a2a2e68e7
Remove the script sponsor logic because scripts are timing out again.
...
This needs to be looked into. This commit, unfortunately, reinstates
a memory leak in regions that see significant script fluctuation,
e.g. lots of scripted attachments, or script development.
2009-08-14 14:18:56 +01:00
ad0d2fea20
Experimental! Implement ISponsor in ScriptInstance
2009-08-07 21:30:21 +01:00
4ee8d8a813
Another stab at cmickeyb's patch for script GC.
...
Moved the Close() for the appdomain-hosted parts into a new destructor
on ScriptInstance.
2009-08-07 20:43:23 +01:00
f8d8366bfa
Revert the XEngine memleak patch, it causes premature GC.
...
This matches behavior seen with an earlier attempt to do this, apparently
the sponsor mechanism does't work in Mono
2009-08-07 03:04:06 +01:00
Melanie