diff options
| author | Melanie | 2013-01-31 02:53:11 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-31 02:53:11 +0000 |
| commit | 9a4de546fe92105c570d6861377ec47d32b4186e (patch) | |
| tree | edfb86074fc7c78126203a2c05a38e260c0d4076 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Add JsonTestStore to determine if a JsonStore is associated with (diff) | |
| download | opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.zip opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.gz opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.bz2 opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 6e04e79..17243ab 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -49,7 +49,6 @@ using OpenSim.Region.Framework.Scenes; | |||
| 49 | using OpenSim.Region.Framework.Interfaces; | 49 | using OpenSim.Region.Framework.Interfaces; |
| 50 | using OpenSim.Region.ScriptEngine.Interfaces; | 50 | using OpenSim.Region.ScriptEngine.Interfaces; |
| 51 | using OpenSim.Region.ScriptEngine.Shared; | 51 | using OpenSim.Region.ScriptEngine.Shared; |
| 52 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | ||
| 53 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; | 52 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; |
| 54 | using OpenSim.Region.ScriptEngine.Shared.Instance; | 53 | using OpenSim.Region.ScriptEngine.Shared.Instance; |
| 55 | using OpenSim.Region.ScriptEngine.Shared.Api; | 54 | using OpenSim.Region.ScriptEngine.Shared.Api; |
| @@ -698,7 +697,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 698 | } | 697 | } |
| 699 | 698 | ||
| 700 | StringBuilder sb = new StringBuilder(); | 699 | StringBuilder sb = new StringBuilder(); |
| 701 | Queue eq = instance.EventQueue; | ||
| 702 | 700 | ||
| 703 | sb.AppendFormat("Script name : {0}\n", instance.ScriptName); | 701 | sb.AppendFormat("Script name : {0}\n", instance.ScriptName); |
| 704 | sb.AppendFormat("Status : {0}\n", status); | 702 | sb.AppendFormat("Status : {0}\n", status); |