diff options
| author | Melanie Thielker | 2008-09-03 10:53:25 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-09-03 10:53:25 +0000 |
| commit | 0fc55818ca8020c166632821b087473ca21d3e9a (patch) | |
| tree | 8de0f16b998b5659d5f15f859e099b3588583ae2 /OpenSim/Region | |
| parent | Mantis#2106. Thank you kindly, HomerHorwitz for a patch that: (diff) | |
| download | opensim-SC-0fc55818ca8020c166632821b087473ca21d3e9a.zip opensim-SC-0fc55818ca8020c166632821b087473ca21d3e9a.tar.gz opensim-SC-0fc55818ca8020c166632821b087473ca21d3e9a.tar.bz2 opensim-SC-0fc55818ca8020c166632821b087473ca21d3e9a.tar.xz | |
Mantis #2109
Prevent a null reference exception when reset is pressed on a script
while it's being compiled.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 6b674f3..311ec86 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -571,6 +571,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 571 | 571 | ||
| 572 | public void ResetScript() | 572 | public void ResetScript() |
| 573 | { | 573 | { |
| 574 | if (m_script == null) | ||
| 575 | return; | ||
| 574 | bool running = Running; | 576 | bool running = Running; |
| 575 | 577 | ||
| 576 | RemoveState(); | 578 | RemoveState(); |