From b4164223496812ccf8c6d0a938f57a12595d68a0 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Fri, 26 Sep 2008 20:18:31 +0000 Subject: Kill "Compile successful" message when rezzing prims/wearing attachments Changes behavior to send on_rez event to prims when rezzed from agent inventory. --- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 5 +++-- OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 4 ++-- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 560e17e..c3391d6 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1311,8 +1311,9 @@ namespace OpenSim.Region.Environment.Scenes } part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); - // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez - part.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine); + // Posting on_rez to the prim. Not much point, but + // needed to kill gratuitious compiler messages + part.CreateScriptInstance(copyID, 0, true, DefaultScriptEngine); // m_log.InfoFormat("[PRIMINVENTORY]: " + // "Rezzed script {0} into prim local ID {1} for user {2}", diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index b593894..8329805 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine LSLCompiler.PerformScriptCompile(Script, assetID.ToString()); - if (presence != null) + if (presence != null && (!postOnRez)) presence.ControllingClient.SendAgentAlertMessage( "Compile successful", false); @@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine } catch (Exception e) // LEGIT: User Scripting { - if (presence != null) + if (presence != null && (!postOnRez)) presence.ControllingClient.SendAgentAlertMessage( "Script saved with errors, check debug window!", false); diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 0448030..a37cbb4 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -500,12 +500,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine { assembly = m_Compiler.PerformScriptCompile(script, assetID.ToString()); - if (presence != null) + if (presence != null && (!postOnRez)) presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); } catch (Exception e) { - if (presence != null) + if (presence != null && (!postOnRez)) presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false); try { -- cgit v1.1