aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs6
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs6
3 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index ee7aa2da..6793ef6 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1035,11 +1035,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1035 1035
1036 } 1036 }
1037 1037
1038 public void SendTeleportLocationStart() 1038 public void SendTeleportStart(uint flags)
1039 { 1039 {
1040 1040
1041 } 1041 }
1042 1042
1043 public void SendTeleportProgress(uint flags, string message)
1044 {
1045 }
1046
1043 public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) 1047 public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
1044 { 1048 {
1045 1049
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 3f15b69..2969503 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1129 OSDMap NewGroupDataMap = new OSDMap(1); 1129 OSDMap NewGroupDataMap = new OSDMap(1);
1130 1130
1131 GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID)); 1131 GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));
1132 GroupDataMap.Add("GroupPowers", OSD.FromBinary(membership.GroupPowers)); 1132 GroupDataMap.Add("GroupPowers", OSD.FromULong(membership.GroupPowers));
1133 GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices)); 1133 GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));
1134 GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture)); 1134 GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));
1135 GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution)); 1135 GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 2e0450c..fae12b6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -611,7 +611,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
611 { 611 {
612 } 612 }
613 613
614 public virtual void SendTeleportLocationStart() 614 public virtual void SendTeleportStart(uint flags)
615 {
616 }
617
618 public virtual void SendTeleportProgress(uint flags, string message)
615 { 619 {
616 } 620 }
617 621