aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-12-14 13:35:53 +0000
committerUbitUmarov2016-12-14 13:35:53 +0000
commit18a292ad02e590619760a71aeb1514e6916b257f (patch)
tree584faa43265cc20ee36d92b2bc14cb1c55435ef0 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
parentMerge branch 'master' into httptests (diff)
parentfix: check for region_handle before region_id, viewers are so funny.. (diff)
downloadopensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.zip
opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.gz
opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.bz2
opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs')
-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 15d31bd..8b8ebe0 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 SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] charterMember, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID) 1250 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] membershipType, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
1251 { 1251 {
1252 1252
1253 } 1253 }