From 1066aa6998de7beb9b0950ca2751a2418c435afb Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 9 Apr 2009 19:49:33 +0000 Subject: [PATCH] * Remove Autooar module pending it's migration to the forge --- .../OptionalModules/Autooar/AutooarModule.cs | 99 ------------------- bin/OpenSim.ini.example | 16 +-- 2 files changed, 3 insertions(+), 112 deletions(-) delete mode 100644 OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs diff --git a/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs b/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs deleted file mode 100644 index 6a3179428f..0000000000 --- a/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Timers; -using Nini.Config; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.Framework.Scenes; - -namespace OpenSim.Region.OptionalModules.Autooar -{ - public class AutooarModule : IRegionModule - { - private readonly Timer m_timer = new Timer(60000*20); - private readonly List m_scenes = new List(); - private IConfigSource config; - private bool m_enabled = false; - - - public void Initialise(Scene scene, IConfigSource source) - { - m_scenes.Add(scene); - config = source; - } - - public void PostInitialise() - { - if (config.Configs["autooar"] != null) - { - m_enabled = config.Configs["autooar"].GetBoolean("Enabled", m_enabled); - } - - if (m_enabled) - { - m_timer.Elapsed += m_timer_Elapsed; - m_timer.AutoReset = true; - m_timer.Start(); - } - } - - void m_timer_Elapsed(object sender, ElapsedEventArgs e) - { - if (!Directory.Exists("autooars")) - Directory.CreateDirectory("autooars"); - - foreach (Scene scene in m_scenes) - { - IRegionArchiverModule archiver = scene.RequestModuleInterface(); - - archiver.ArchiveRegion(Path.Combine("autooars", - scene.RegionInfo.RegionName + "_" + scene.RegionInfo.RegionLocX + - "x" + scene.RegionInfo.RegionLocY + ".oar.tar.gz")); - } - } - - public void Close() - { - if (m_timer.Enabled) - m_timer.Stop(); - } - - public string Name - { - get { return "Automatic OAR Module"; } - } - - public bool IsSharedModule - { - get { return true; } - } - } -} diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 813b1f1f9a..51dd7ff1e3 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -238,8 +238,8 @@ ; enableprejump = true -[SMTP] +[SMTP] enabled=false ;enabled=true @@ -250,22 +250,11 @@ ;SMTP_SERVER_LOGIN=foo ;SMTP_SERVER_PASSWORD=bar -[Communications] +[Communications] ;InterregionComms = "LocalComms" InterregionComms = "RESTComms" -[AutoOAR] - - ;Enable the AutoOAR module. - ;OAR's are automatically exported to Regionname_x_y.oar.tar.gz - - enabled = false - - ;Interval, in minutes, between exports - - interval = 20 - [StandAlone] accounts_authenticate = true @@ -369,6 +358,7 @@ ; " (Mozilla Compatible)" to the text where there are problems with a web server ;user_agent = "OpenSim LSL (Mozilla Compatible)" + [ClientStack.LindenUDP] ; This is the multiplier applied to all client throttles for outgoing UDP network data ; If it is set to 1, then we obey the throttle settings as given to us by the client. If it is set to 3, for example, then we