diff options
| author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
| commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
| tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |
| parent | Merge git://opensimulator.org/git/opensim (diff) | |
| parent | minor: remove mono compiler warnings (diff) | |
| download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz | |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index a5fcb49..0babeb5 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | using System; | 28 | using System; |
| 29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
| 30 | using Nini.Config; | 30 | using Nini.Config; |
| 31 | using OpenSim.Framework; | ||
| 31 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |
| 32 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
| 33 | using OpenMetaverse; | 34 | using OpenMetaverse; |