diff options
| author | John Hurliman | 2010-03-07 16:05:12 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-03-07 16:05:12 -0800 |
| commit | d71ed7081b2267ff056927c97ac8ef32466f7b96 (patch) | |
| tree | d5308dc67cde3e7aa5c3d323598b49c449529a31 /OpenSim/Client | |
| parent | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit syst... (diff) | |
| parent | Bug fix: correct name of methods in user accounts connector. (diff) | |
| download | opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.zip opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.gz opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.bz2 opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 cf87a30..7b435f5 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1710,5 +1710,9 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1710 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1710 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1711 | { | 1711 | { |
| 1712 | } | 1712 | } |
| 1713 | |||
| 1714 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1715 | { | ||
| 1716 | } | ||
| 1713 | } | 1717 | } |
| 1714 | } | 1718 | } |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index 56f5f8f..e2986d9 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -1199,6 +1199,10 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 1199 | { | 1199 | { |
| 1200 | } | 1200 | } |
| 1201 | 1201 | ||
| 1202 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1203 | { | ||
| 1204 | } | ||
| 1205 | |||
| 1202 | #endregion | 1206 | #endregion |
| 1203 | } | 1207 | } |
| 1204 | } | 1208 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index b8f46dc..c4f2016 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -1214,5 +1214,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 1214 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1214 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1215 | { | 1215 | { |
| 1216 | } | 1216 | } |
| 1217 | |||
| 1218 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1219 | { | ||
| 1220 | } | ||
| 1217 | } | 1221 | } |
| 1218 | } | 1222 | } |