aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorMelanie2013-08-13 22:53:47 +0100
committerMelanie2013-08-13 22:53:47 +0100
commit4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6 (patch)
tree245e7c3257c8c6c29356ba5c1eb61ae50a127226 /OpenSim/Region/ScriptEngine/Shared/Instance
parentMerge branch 'master' into careminster (diff)
parentminor: Eliminate one of the duplicate 'have's in the HG message telling the u... (diff)
downloadopensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.zip
opensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.gz
opensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.bz2
opensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 3646c98..2fb073d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -533,7 +533,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
533 m_log.Warn( 533 m_log.Warn(
534 string.Format( 534 string.Format(
535 "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ", 535 "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ",
536 ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), 536 savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name),
537 e); 537 e);
538 } 538 }
539 } 539 }