aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorDiva Canto2011-05-06 09:09:13 -0700
committerDiva Canto2011-05-06 09:09:13 -0700
commit50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe (patch)
tree546d13e4f4925b82dc8a0fa037eeb0928d188132 /OpenSim/Region/OptionalModules
parentBug fix: iars under Library weren't being loaded. (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.zip
opensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.gz
opensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.bz2
opensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.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.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index db17d8f..62e6fae 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)