aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent
diff options
context:
space:
mode:
authorMelanie2011-05-08 20:23:06 +0100
committerMelanie2011-05-08 20:23:06 +0100
commitb451cc1ebb9e950bb93e790ab9e83aff30a47c61 (patch)
treec9fbe41be36cf791976f9e5afabd44f69b64e747 /OpenSim/Region/OptionalModules/Agent
parentEnable compressed (gzip) fatpack transfers. (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.zip
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.gz
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.bz2
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index db17d8f..8f8124e 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -107,11 +107,10 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
107 107
108 scene.AddCommand( 108 scene.AddCommand(
109 this, "emergency-monitoring", 109 this, "emergency-monitoring",
110 "Go on/off emergency monitoring mode", 110 "emergency-monitoring",
111 "Go on/off emergency monitoring mode", 111 "Go on/off emergency monitoring mode",
112 "Go on/off emergency monitoring mode", 112 "Go on/off emergency monitoring mode",
113 EmergencyMonitoring); 113 EmergencyMonitoring);
114
115 } 114 }
116 115
117 public void RemoveRegion(Scene scene) 116 public void RemoveRegion(Scene scene)
@@ -190,7 +189,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
190 int maxNameLength = 18; 189 int maxNameLength = 18;
191 int maxRegionNameLength = 14; 190 int maxRegionNameLength = 14;
192 int maxTypeLength = 4; 191 int maxTypeLength = 4;
193 int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; 192// int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
194 193
195 report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); 194 report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
196 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); 195 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));