aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs4
3 files changed, 7 insertions, 6 deletions
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
1311 } 1311 }
1312 1312
1313 part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); 1313 part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID);
1314 // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez 1314 // Posting on_rez to the prim. Not much point, but
1315 part.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine); 1315 // needed to kill gratuitious compiler messages
1316 part.CreateScriptInstance(copyID, 0, true, DefaultScriptEngine);
1316 1317
1317 // m_log.InfoFormat("[PRIMINVENTORY]: " + 1318 // m_log.InfoFormat("[PRIMINVENTORY]: " +
1318 // "Rezzed script {0} into prim local ID {1} for user {2}", 1319 // "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
145 LSLCompiler.PerformScriptCompile(Script, 145 LSLCompiler.PerformScriptCompile(Script,
146 assetID.ToString()); 146 assetID.ToString());
147 147
148 if (presence != null) 148 if (presence != null && (!postOnRez))
149 presence.ControllingClient.SendAgentAlertMessage( 149 presence.ControllingClient.SendAgentAlertMessage(
150 "Compile successful", false); 150 "Compile successful", false);
151 151
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
205 } 205 }
206 catch (Exception e) // LEGIT: User Scripting 206 catch (Exception e) // LEGIT: User Scripting
207 { 207 {
208 if (presence != null) 208 if (presence != null && (!postOnRez))
209 presence.ControllingClient.SendAgentAlertMessage( 209 presence.ControllingClient.SendAgentAlertMessage(
210 "Script saved with errors, check debug window!", 210 "Script saved with errors, check debug window!",
211 false); 211 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
500 { 500 {
501 assembly = m_Compiler.PerformScriptCompile(script, 501 assembly = m_Compiler.PerformScriptCompile(script,
502 assetID.ToString()); 502 assetID.ToString());
503 if (presence != null) 503 if (presence != null && (!postOnRez))
504 presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); 504 presence.ControllingClient.SendAgentAlertMessage("Compile successful", false);
505 } 505 }
506 catch (Exception e) 506 catch (Exception e)
507 { 507 {
508 if (presence != null) 508 if (presence != null && (!postOnRez))
509 presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false); 509 presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false);
510 try 510 try
511 { 511 {