diff options
| author | Diva Canto | 2010-02-22 09:56:33 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-02-22 09:56:33 -0800 |
| commit | de91a9e09bbb6c41eeb022540ae08952f413fb12 (patch) | |
| tree | f4a40f7999f9c55661162b2764c883f764597973 /OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |
| parent | Deleted duplicate [GridService] section. (diff) | |
| parent | Merge branch 'master' into presence-refactor (diff) | |
| download | opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2 opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 0bd68dd..3614915 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
| @@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
| 159 | avatar.Invulnerable = true; | 159 | avatar.Invulnerable = true; |
| 160 | } | 160 | } |
| 161 | } | 161 | } |
| 162 | catch (Exception ex) | 162 | catch (Exception) |
| 163 | { | 163 | { |
| 164 | } | 164 | } |
| 165 | } | 165 | } |