diff options
| author | Melanie | 2012-07-20 09:31:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-20 09:31:06 +0100 |
| commit | 7da744566d491a30c1baf99af39478518d75a6a9 (patch) | |
| tree | 3f69ee9d45475fd4e8d09a85b0ab78150f3d9943 /OpenSim/Region/Application/OpenSim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: switch around mixed up circuit code and endpoint data in "show connect... (diff) | |
| download | opensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.zip opensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.tar.gz opensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.tar.bz2 opensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index e6b57c2..8a0b4ab 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -1145,8 +1145,8 @@ namespace OpenSim | |||
| 1145 | c => cdt.AddRow( | 1145 | c => cdt.AddRow( |
| 1146 | s.Name, | 1146 | s.Name, |
| 1147 | c.Name, | 1147 | c.Name, |
| 1148 | c.RemoteEndPoint.ToString(), | ||
| 1149 | c.CircuitCode.ToString(), | 1148 | c.CircuitCode.ToString(), |
| 1149 | c.RemoteEndPoint.ToString(), | ||
| 1150 | c.IsActive.ToString()))); | 1150 | c.IsActive.ToString()))); |
| 1151 | 1151 | ||
| 1152 | MainConsole.Instance.Output(cdt.ToString()); | 1152 | MainConsole.Instance.Output(cdt.ToString()); |