Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-01-24 00:27:00 +00:00
8 changed files with 11 additions and 4 deletions

View File

@@ -307,6 +307,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
null,
constructorParams,
null,
null,
null);
else
m_Script