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/OptionalModules | |
| 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/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index ec18db0..44d4e93 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
| @@ -669,7 +669,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
| 669 | aCircuit = new AgentCircuitData(); | 669 | aCircuit = new AgentCircuitData(); |
| 670 | 670 | ||
| 671 | if (!llClient.SceneAgent.IsChildAgent) | 671 | if (!llClient.SceneAgent.IsChildAgent) |
| 672 | m_log.InfoFormat("[INFO]: {0} # {1} # {2}", llClient.Name, aCircuit.Viewer, aCircuit.Id0); | 672 | m_log.InfoFormat("[INFO]: {0} # {1} # {2}", llClient.Name, Util.GetViewerName(aCircuit), aCircuit.Id0); |
| 673 | 673 | ||
| 674 | int avg_reqs = cinfo.AsyncRequests.Values.Sum() + cinfo.GenericRequests.Values.Sum() + cinfo.SyncRequests.Values.Sum(); | 674 | int avg_reqs = cinfo.AsyncRequests.Values.Sum() + cinfo.GenericRequests.Values.Sum() + cinfo.SyncRequests.Values.Sum(); |
| 675 | avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1); | 675 | avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1); |
| @@ -706,4 +706,4 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
| 706 | m_log.InfoFormat("[INFO]: {0,25} {1,-6}", "Total", sum); | 706 | m_log.InfoFormat("[INFO]: {0,25} {1,-6}", "Total", sum); |
| 707 | } | 707 | } |
| 708 | } | 708 | } |
| 709 | } \ No newline at end of file | 709 | } |