diff options
| author | BlueWall | 2011-05-05 20:07:19 -0400 |
|---|---|---|
| committer | BlueWall | 2011-05-05 20:07:19 -0400 |
| commit | 68bb0f81e2583754a089a7abff6b663457d33fe4 (patch) | |
| tree | 6f00fa2a0ec3a7797455f44c3941692ad723594b /OpenSim/Region/OptionalModules | |
| parent | Add support for llRequestSecureURL() if ssl is enabled (diff) | |
| parent | add descriptive explanations for region restart functionality (diff) | |
| download | opensim-SC_OLD-68bb0f81e2583754a089a7abff6b663457d33fe4.zip opensim-SC_OLD-68bb0f81e2583754a089a7abff6b663457d33fe4.tar.gz opensim-SC_OLD-68bb0f81e2583754a089a7abff6b663457d33fe4.tar.bz2 opensim-SC_OLD-68bb0f81e2583754a089a7abff6b663457d33fe4.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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index bdebbfb..62e6fae 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
| @@ -111,7 +111,6 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
| 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) |