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/OptionalModules/World | |
| 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/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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) |