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/OptionalModules | |
| 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 '')
3 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 49382f0..821cd4b 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1247,7 +1247,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1247 | 1247 | ||
| 1248 | } | 1248 | } |
| 1249 | 1249 | ||
| 1250 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 1250 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 1251 | { | 1251 | { |
| 1252 | 1252 | ||
| 1253 | } | 1253 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs index 8df020f..c898da6 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs | |||
| @@ -25,6 +25,7 @@ | |||
| 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 | ||
| 28 | using OpenSim.Framework; | ||
| 28 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
| 29 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
| 30 | 31 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 5d44aa1..96760a2 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -925,7 +925,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 925 | { | 925 | { |
| 926 | } | 926 | } |
| 927 | 927 | ||
| 928 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 928 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 929 | { | 929 | { |
| 930 | } | 930 | } |
| 931 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 931 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) |