diff options
| author | Melanie | 2010-03-09 22:46:17 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-09 22:46:17 +0000 |
| commit | 40873504dcde19a3738cf4d3a4928a59b811e8f0 (patch) | |
| tree | 605d2c2575e21496b05eeabd0a5755b8fa788efd /OpenSim/Client | |
| parent | - parcel blocking, region crossing blocking, teleport blocking (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.zip opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.gz opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.bz2 opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index f8cfe44..17bd795 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1711,5 +1711,9 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1711 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1711 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1712 | { | 1712 | { |
| 1713 | } | 1713 | } |
| 1714 | |||
| 1715 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1716 | { | ||
| 1717 | } | ||
| 1714 | } | 1718 | } |
| 1715 | } | 1719 | } |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index 3bf73d6..b199b93 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -1200,6 +1200,10 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 1200 | { | 1200 | { |
| 1201 | } | 1201 | } |
| 1202 | 1202 | ||
| 1203 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1204 | { | ||
| 1205 | } | ||
| 1206 | |||
| 1203 | #endregion | 1207 | #endregion |
| 1204 | } | 1208 | } |
| 1205 | } | 1209 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 894fdac..1da746a 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -1215,5 +1215,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 1215 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1215 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1216 | { | 1216 | { |
| 1217 | } | 1217 | } |
| 1218 | |||
| 1219 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1220 | { | ||
| 1221 | } | ||
| 1218 | } | 1222 | } |
| 1219 | } | 1223 | } |