diff options
author | Jeff Ames | 2008-07-23 13:24:25 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-23 13:24:25 +0000 |
commit | 80d8e2889e62d8900837d37a800a4eeaae5ffc5a (patch) | |
tree | 47bdf0f48ae8ace3bb7cd10ab91d91b52b96f80e /OpenSim/Region/ScriptEngine/XEngine | |
parent | get rid of some LLQuaternion == null checks. Because LLQuaternion is (diff) | |
download | opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.zip opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.gz opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.bz2 opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.xz |
Update svn properties. Formatting cleanup. Remove a compiler warning.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 9f67dc1..673189a 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1191,8 +1191,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1191 | if (result == null) | 1191 | if (result == null) |
1192 | return true; | 1192 | return true; |
1193 | 1193 | ||
1194 | if(!m_InSelfDelete) | 1194 | if (!m_InSelfDelete) |
1195 | result.Abort(); | 1195 | result.Abort(); |
1196 | 1196 | ||
1197 | lock (m_EventQueue) | 1197 | lock (m_EventQueue) |
1198 | { | 1198 | { |
@@ -1342,10 +1342,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1342 | e.ToString()); | 1342 | e.ToString()); |
1343 | } | 1343 | } |
1344 | } | 1344 | } |
1345 | else if((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) | 1345 | else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) |
1346 | { | 1346 | { |
1347 | m_InSelfDelete = true; | 1347 | m_InSelfDelete = true; |
1348 | if(part != null && part.ParentGroup != null) | 1348 | if (part != null && part.ParentGroup != null) |
1349 | m_Engine.World.DeleteSceneObject(part.ParentGroup); | 1349 | m_Engine.World.DeleteSceneObject(part.ParentGroup); |
1350 | } | 1350 | } |
1351 | } | 1351 | } |