diff options
| author | Melanie | 2012-10-30 01:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-30 01:02:20 +0000 |
| commit | 48569e856a9c9ced207652b10e2abde94c849687 (patch) | |
| tree | 8955c0206f1822f4bbb44466fae74e18923d125c /OpenSim/Region/Application/OpenSim.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Make MeshAssetReceived private. (diff) | |
| download | opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.zip opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.gz opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.bz2 opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 3d4dce1..5f07272 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -1111,7 +1111,7 @@ namespace OpenSim | |||
| 1111 | aCircuit.Name, | 1111 | aCircuit.Name, |
| 1112 | aCircuit.child ? "child" : "root", | 1112 | aCircuit.child ? "child" : "root", |
| 1113 | aCircuit.circuitcode.ToString(), | 1113 | aCircuit.circuitcode.ToString(), |
| 1114 | aCircuit.IPAddress.ToString(), | 1114 | aCircuit.IPAddress != null ? aCircuit.IPAddress.ToString() : "not set", |
| 1115 | aCircuit.Viewer); | 1115 | aCircuit.Viewer); |
| 1116 | }); | 1116 | }); |
| 1117 | 1117 | ||