aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2009-12-26 04:13:27 +0000
committerMelanie2009-12-26 04:13:27 +0000
commitf3a48606359cd6082f294af7defcdede67bf5853 (patch)
tree642aab2baa9247d695cb88b729a0b841a9d6e1a7 /OpenSim/Region/OptionalModules
parentMake the GenericTableHandler work as intended (diff)
parentAdd AvatarInterestsReply (diff)
downloadopensim-SC_OLD-f3a48606359cd6082f294af7defcdede67bf5853.zip
opensim-SC_OLD-f3a48606359cd6082f294af7defcdede67bf5853.tar.gz
opensim-SC_OLD-f3a48606359cd6082f294af7defcdede67bf5853.tar.bz2
opensim-SC_OLD-f3a48606359cd6082f294af7defcdede67bf5853.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs4
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index bdf1574..c333413 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1624,5 +1624,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1624 public void SendRebakeAvatarTextures(UUID textureID) 1624 public void SendRebakeAvatarTextures(UUID textureID)
1625 { 1625 {
1626 } 1626 }
1627
1628 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1629 {
1630 }
1627 } 1631 }
1628} 1632}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 975033a..9ca5a0a 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -1104,5 +1104,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1104 public void SendRebakeAvatarTextures(UUID textureID) 1104 public void SendRebakeAvatarTextures(UUID textureID)
1105 { 1105 {
1106 } 1106 }
1107
1108 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1109 {
1110 }
1107 } 1111 }
1108} 1112}