diff options
| author | Melanie | 2009-12-26 04:13:27 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-26 04:13:27 +0000 |
| commit | f3a48606359cd6082f294af7defcdede67bf5853 (patch) | |
| tree | 642aab2baa9247d695cb88b729a0b841a9d6e1a7 /OpenSim/Client | |
| parent | Make the GenericTableHandler work as intended (diff) | |
| parent | Add AvatarInterestsReply (diff) | |
| download | opensim-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/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 9f9d151..6e04a40 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1655,5 +1655,9 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1655 | public void SendRebakeAvatarTextures(UUID textureID) | 1655 | public void SendRebakeAvatarTextures(UUID textureID) |
| 1656 | { | 1656 | { |
| 1657 | } | 1657 | } |
| 1658 | |||
| 1659 | public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) | ||
| 1660 | { | ||
| 1661 | } | ||
| 1658 | } | 1662 | } |
| 1659 | } | 1663 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 533475f..02b1dee 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -1161,5 +1161,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 1161 | public void SendRebakeAvatarTextures(UUID textureID) | 1161 | public void SendRebakeAvatarTextures(UUID textureID) |
| 1162 | { | 1162 | { |
| 1163 | } | 1163 | } |
| 1164 | |||
| 1165 | public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) | ||
| 1166 | { | ||
| 1167 | } | ||
| 1164 | } | 1168 | } |
| 1165 | } | 1169 | } |