diff options
| author | Justin Clark-Casey (justincc) | 2011-03-25 23:05:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-03-25 23:05:51 +0000 |
| commit | 6ae04448f73afdca791ea185fdc0e9c062dea87b (patch) | |
| tree | 704c7f3722ae802543c9b0d01bd704ca33f4f720 /OpenSim/Region/CoreModules/Avatar | |
| parent | Add ILandObject.IPrimCounts for the new prim count module. (diff) | |
| download | opensim-SC-6ae04448f73afdca791ea185fdc0e9c062dea87b.zip opensim-SC-6ae04448f73afdca791ea185fdc0e9c062dea87b.tar.gz opensim-SC-6ae04448f73afdca791ea185fdc0e9c062dea87b.tar.bz2 opensim-SC-6ae04448f73afdca791ea185fdc0e9c062dea87b.tar.xz | |
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
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; |