aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Combat
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs24
1 files changed, 7 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 1ed608a..f4dffb5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -25,22 +25,12 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections.Generic;
30using System.Collections.Generic; 30using Nini.Config;
31using System.Net; 31using OpenSim.Region.Framework.Interfaces;
32using System.Net.Sockets; 32using OpenSim.Region.Framework.Scenes;
33using System.Reflection; 33
34using System.Xml;
35using OpenMetaverse;
36using log4net;
37using Nini.Config;
38using Nwc.XmlRpc;
39using OpenSim.Framework;
40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Framework.Communications.Cache;
43
44namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule 34namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
45{ 35{
46 public class CombatModule : IRegionModule 36 public class CombatModule : IRegionModule
@@ -117,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
117 foundResult = true; 107 foundResult = true;
118 } 108 }
119 } 109 }
120 } catch (System.InvalidOperationException) 110 } catch (InvalidOperationException)
121 { 111 {
122 112
123 } 113 }