diff options
| author | Justin Clark-Casey (justincc) | 2012-03-15 01:26:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-19 21:30:16 +0000 |
| commit | 5f1da80fc16ff082a9e80129a4be96c8ca2ac9d7 (patch) | |
| tree | e9e604613a3282a2dbe64eba0f3acf9b783a849f | |
| parent | Remove duplication of m_RunEvents and Running (diff) | |
| download | opensim-SC_OLD-5f1da80fc16ff082a9e80129a4be96c8ca2ac9d7.zip opensim-SC_OLD-5f1da80fc16ff082a9e80129a4be96c8ca2ac9d7.tar.gz opensim-SC_OLD-5f1da80fc16ff082a9e80129a4be96c8ca2ac9d7.tar.bz2 opensim-SC_OLD-5f1da80fc16ff082a9e80129a4be96c8ca2ac9d7.tar.xz | |
minor: correct indentation levels
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index cc4be73..afa9191 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -282,19 +282,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 282 | { | 282 | { |
| 283 | m_Apis[api] = am.CreateApi(api); | 283 | m_Apis[api] = am.CreateApi(api); |
| 284 | m_Apis[api].Initialize(engine, part, m_LocalID, itemID); | 284 | m_Apis[api].Initialize(engine, part, m_LocalID, itemID); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | try | 287 | try |
| 288 | { | 288 | { |
| 289 | if (dom != System.AppDomain.CurrentDomain) | 289 | if (dom != System.AppDomain.CurrentDomain) |
| 290 | m_Script = (IScript)dom.CreateInstanceAndUnwrap( | 290 | m_Script = (IScript)dom.CreateInstanceAndUnwrap( |
| 291 | Path.GetFileNameWithoutExtension(assembly), | 291 | Path.GetFileNameWithoutExtension(assembly), |
| 292 | "SecondLife.Script"); | 292 | "SecondLife.Script"); |
| 293 | else | 293 | else |
| 294 | m_Script = (IScript)Assembly.Load( | 294 | m_Script = (IScript)Assembly.Load( |
| 295 | Path.GetFileNameWithoutExtension(assembly)).CreateInstance( | 295 | Path.GetFileNameWithoutExtension(assembly)).CreateInstance( |
| 296 | "SecondLife.Script"); | 296 | "SecondLife.Script"); |
| 297 | |||
| 298 | 297 | ||
| 299 | //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | 298 | //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); |
| 300 | //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | 299 | //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); |