diff options
| author | Dan Lake | 2012-02-02 17:44:11 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-02 17:44:11 -0800 |
| commit | 3257dbe76dff0a1e5842cafc75e4c2d09278deab (patch) | |
| tree | 7f7d1a58ca910d8acefbd3bee0c3d096a59d8a43 /OpenSim/Region/OptionalModules | |
| parent | ObjectAddedToScene event should be fired when duplicating objects (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-3257dbe76dff0a1e5842cafc75e4c2d09278deab.zip opensim-SC_OLD-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.gz opensim-SC_OLD-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.bz2 opensim-SC_OLD-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index bbf3729..11f927c 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1253,7 +1253,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1253 | 1253 | ||
| 1254 | } | 1254 | } |
| 1255 | 1255 | ||
| 1256 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 1256 | public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID) |
| 1257 | { | 1257 | { |
| 1258 | 1258 | ||
| 1259 | } | 1259 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 6d40a92..81bf9ed 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -940,7 +940,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 940 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 940 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 941 | { | 941 | { |
| 942 | } | 942 | } |
| 943 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 943 | public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID) |
| 944 | { | 944 | { |
| 945 | } | 945 | } |
| 946 | public void SendForceClientSelectObjects(List<uint> objectIDs) | 946 | public void SendForceClientSelectObjects(List<uint> objectIDs) |