aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
diff options
context:
space:
mode:
authorDan Lake2012-02-02 17:44:11 -0800
committerDan Lake2012-02-02 17:44:11 -0800
commit3257dbe76dff0a1e5842cafc75e4c2d09278deab (patch)
tree7f7d1a58ca910d8acefbd3bee0c3d096a59d8a43 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
parentObjectAddedToScene event should be fired when duplicating objects (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.zip
opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.gz
opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.bz2
opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
1 files changed, 1 insertions, 1 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 }