OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kill "Compile successful" message when rezzing prims/wearing attachments 

Changes behavior to send on_rez event to prims when rezzed from agent
inventory.
0.6.0-stable
Melanie Thielker 2008-09-26 20:18:31 +00:00
parent 415520cea6
commit b416422349
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1311,8 +1311,9 @@ namespace OpenSim.Region.Environment.Scenes
} }
part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID);
// TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez // Posting on_rez to the prim. Not much point, but
part.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine); // needed to kill gratuitious compiler messages
part.CreateScriptInstance(copyID, 0, true, DefaultScriptEngine);
// m_log.InfoFormat("[PRIMINVENTORY]: " + // m_log.InfoFormat("[PRIMINVENTORY]: " +
// "Rezzed script {0} into prim local ID {1} for user {2}", // "Rezzed script {0} into prim local ID {1} for user {2}",

4
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
LSLCompiler.PerformScriptCompile(Script, LSLCompiler.PerformScriptCompile(Script,
assetID.ToString()); assetID.ToString());
if (presence != null) if (presence != null && (!postOnRez))
presence.ControllingClient.SendAgentAlertMessage( presence.ControllingClient.SendAgentAlertMessage(
"Compile successful", false); "Compile successful", false);
@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
} }
catch (Exception e) // LEGIT: User Scripting catch (Exception e) // LEGIT: User Scripting
{ {
if (presence != null) if (presence != null && (!postOnRez))
presence.ControllingClient.SendAgentAlertMessage( presence.ControllingClient.SendAgentAlertMessage(
"Script saved with errors, check debug window!", "Script saved with errors, check debug window!",
false); false);

4
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -500,12 +500,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
assembly = m_Compiler.PerformScriptCompile(script, assembly = m_Compiler.PerformScriptCompile(script,
assetID.ToString()); assetID.ToString());
if (presence != null) if (presence != null && (!postOnRez))
presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); presence.ControllingClient.SendAgentAlertMessage("Compile successful", false);
} }
catch (Exception e) catch (Exception e)
{ {
if (presence != null) if (presence != null && (!postOnRez))
presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false); presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false);
try try
{ {