diff options
| author | Melanie | 2010-03-18 20:09:04 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 20:09:04 +0000 |
| commit | 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch) | |
| tree | 9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Region/Application | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rwxr-xr-x | 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 7e81650..38b2084 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -897,7 +897,7 @@ namespace OpenSim | |||
| 897 | { | 897 | { |
| 898 | connections.AppendFormat("{0}: {1} ({2}) from {3} on circuit {4}\n", | 898 | connections.AppendFormat("{0}: {1} ({2}) from {3} on circuit {4}\n", |
| 899 | scene.RegionInfo.RegionName, client.Name, client.AgentId, client.RemoteEndPoint, client.CircuitCode); | 899 | scene.RegionInfo.RegionName, client.Name, client.AgentId, client.RemoteEndPoint, client.CircuitCode); |
| 900 | }, false | 900 | } |
| 901 | ); | 901 | ); |
| 902 | } | 902 | } |
| 903 | ); | 903 | ); |