diff options
| author | John Hurliman | 2010-02-22 14:10:19 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 14:10:19 -0800 |
| commit | 71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch) | |
| tree | cca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Region/CoreModules/Avatar/Combat | |
| parent | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff) | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| download | opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2 opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz | |
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat')
| -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 | } |