diff options
| author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
|---|---|---|
| committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
| commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
| tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |
| parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
| parent | Slight rewording of output messages. (diff) | |
| download | opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 6e36742..2c8af81 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -964,7 +964,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 964 | public IScriptApi GetApi(string name) | 964 | public IScriptApi GetApi(string name) |
| 965 | { | 965 | { |
| 966 | if (m_Apis.ContainsKey(name)) | 966 | if (m_Apis.ContainsKey(name)) |
| 967 | { | ||
| 968 | // m_log.DebugFormat("[SCRIPT INSTANCE]: Found api {0} in {1}@{2}", name, ScriptName, PrimName); | ||
| 969 | |||
| 967 | return m_Apis[name]; | 970 | return m_Apis[name]; |
| 971 | } | ||
| 972 | |||
| 973 | // m_log.DebugFormat("[SCRIPT INSTANCE]: Did not find api {0} in {1}@{2}", name, ScriptName, PrimName); | ||
| 974 | |||
| 968 | return null; | 975 | return null; |
| 969 | } | 976 | } |
| 970 | 977 | ||