Add try/catch around Json script method registration to avoild some issues
with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971integration
parent
84891930aa
commit
bec100a662
|
@ -163,6 +163,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
|
|||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
m_comms.RegisterScriptInvocation(this,"JsonCreateStore");
|
||||
m_comms.RegisterScriptInvocation(this,"JsonDestroyStore");
|
||||
|
||||
|
@ -186,6 +188,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
|
|||
|
||||
m_comms.RegisterScriptInvocation(this,"JsonRemoveValue");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// See http://opensimulator.org/mantis/view.php?id=5971 for more information
|
||||
m_log.WarnFormat("[JsonStroreScripts] script method registration failed; {0}",e.Message);
|
||||
m_enabled = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// -----------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue