diff options
| author | Justin Clark-Casey (justincc) | 2011-03-29 23:08:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-03-29 23:08:44 +0100 |
| commit | f754dedbef45097910f3977ca22e9afaaaed9196 (patch) | |
| tree | 88f2119ec41194436baae80c974795f4083f0944 /OpenSim/Region/CoreModules/Avatar | |
| parent | Improvement over 2 commits ago: make the hyperlink check understand port 80. (diff) | |
| parent | disable prim count debug logging temporarily (diff) | |
| download | opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.zip opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.tar.gz opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.tar.bz2 opensim-SC-f754dedbef45097910f3977ca22e9afaaaed9196.tar.xz | |
Merge branch 'primcounts'
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -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; |