diff options
| author | Melanie | 2012-07-13 02:27:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-13 02:27:16 +0100 |
| commit | 64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch) | |
| tree | 12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Framework/IClientAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff) | |
| download | opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 4b15325..58a65de 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1369,7 +1369,6 @@ namespace OpenSim.Framework | |||
| 1369 | void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message); | 1369 | void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message); |
| 1370 | 1370 | ||
| 1371 | void SendLogoutPacket(); | 1371 | void SendLogoutPacket(); |
| 1372 | EndPoint GetClientEP(); | ||
| 1373 | 1372 | ||
| 1374 | // WARNING WARNING WARNING | 1373 | // WARNING WARNING WARNING |
| 1375 | // | 1374 | // |