diff options
| author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
| commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
| tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /OpenSim/Region/Application/OpenSim.cs | |
| parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
| parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
| download | opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 6d3331b..5c3039d 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -982,7 +982,7 @@ namespace OpenSim | |||
| 982 | aCircuit.child ? "child" : "root", | 982 | aCircuit.child ? "child" : "root", |
| 983 | aCircuit.circuitcode.ToString(), | 983 | aCircuit.circuitcode.ToString(), |
| 984 | aCircuit.IPAddress != null ? aCircuit.IPAddress.ToString() : "not set", | 984 | aCircuit.IPAddress != null ? aCircuit.IPAddress.ToString() : "not set", |
| 985 | aCircuit.Viewer); | 985 | Util.GetViewerName(aCircuit)); |
| 986 | }); | 986 | }); |
| 987 | 987 | ||
| 988 | MainConsole.Instance.Output(cdt.ToString()); | 988 | MainConsole.Instance.Output(cdt.ToString()); |