diff options
author | Justin Clarke Casey | 2009-04-09 19:49:33 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-09 19:49:33 +0000 |
commit | 1066aa6998de7beb9b0950ca2751a2418c435afb (patch) | |
tree | 5f0f6bc60a45a13b92b2ebc4f4ba7857b2913d90 | |
parent | * Terminate OpenSim startup if we cannot listen to the designated HTTP port (diff) | |
download | opensim-SC_OLD-1066aa6998de7beb9b0950ca2751a2418c435afb.zip opensim-SC_OLD-1066aa6998de7beb9b0950ca2751a2418c435afb.tar.gz opensim-SC_OLD-1066aa6998de7beb9b0950ca2751a2418c435afb.tar.bz2 opensim-SC_OLD-1066aa6998de7beb9b0950ca2751a2418c435afb.tar.xz |
* Remove Autooar module pending it's migration to the forge
-rw-r--r-- | OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs | 99 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 16 |
2 files changed, 3 insertions, 112 deletions
diff --git a/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs b/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs deleted file mode 100644 index 6a31794..0000000 --- a/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.IO; | ||
31 | using System.Text; | ||
32 | using System.Timers; | ||
33 | using Nini.Config; | ||
34 | using OpenSim.Region.Framework.Interfaces; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | |||
37 | namespace OpenSim.Region.OptionalModules.Autooar | ||
38 | { | ||
39 | public class AutooarModule : IRegionModule | ||
40 | { | ||
41 | private readonly Timer m_timer = new Timer(60000*20); | ||
42 | private readonly List<Scene> m_scenes = new List<Scene>(); | ||
43 | private IConfigSource config; | ||
44 | private bool m_enabled = false; | ||
45 | |||
46 | |||
47 | public void Initialise(Scene scene, IConfigSource source) | ||
48 | { | ||
49 | m_scenes.Add(scene); | ||
50 | config = source; | ||
51 | } | ||
52 | |||
53 | public void PostInitialise() | ||
54 | { | ||
55 | if (config.Configs["autooar"] != null) | ||
56 | { | ||
57 | m_enabled = config.Configs["autooar"].GetBoolean("Enabled", m_enabled); | ||
58 | } | ||
59 | |||
60 | if (m_enabled) | ||
61 | { | ||
62 | m_timer.Elapsed += m_timer_Elapsed; | ||
63 | m_timer.AutoReset = true; | ||
64 | m_timer.Start(); | ||
65 | } | ||
66 | } | ||
67 | |||
68 | void m_timer_Elapsed(object sender, ElapsedEventArgs e) | ||
69 | { | ||
70 | if (!Directory.Exists("autooars")) | ||
71 | Directory.CreateDirectory("autooars"); | ||
72 | |||
73 | foreach (Scene scene in m_scenes) | ||
74 | { | ||
75 | IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); | ||
76 | |||
77 | archiver.ArchiveRegion(Path.Combine("autooars", | ||
78 | scene.RegionInfo.RegionName + "_" + scene.RegionInfo.RegionLocX + | ||
79 | "x" + scene.RegionInfo.RegionLocY + ".oar.tar.gz")); | ||
80 | } | ||
81 | } | ||
82 | |||
83 | public void Close() | ||
84 | { | ||
85 | if (m_timer.Enabled) | ||
86 | m_timer.Stop(); | ||
87 | } | ||
88 | |||
89 | public string Name | ||
90 | { | ||
91 | get { return "Automatic OAR Module"; } | ||
92 | } | ||
93 | |||
94 | public bool IsSharedModule | ||
95 | { | ||
96 | get { return true; } | ||
97 | } | ||
98 | } | ||
99 | } | ||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 813b1f1..51dd7ff 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -238,8 +238,8 @@ | |||
238 | 238 | ||
239 | ; enableprejump = true | 239 | ; enableprejump = true |
240 | 240 | ||
241 | [SMTP] | ||
242 | 241 | ||
242 | [SMTP] | ||
243 | enabled=false | 243 | enabled=false |
244 | 244 | ||
245 | ;enabled=true | 245 | ;enabled=true |
@@ -250,22 +250,11 @@ | |||
250 | ;SMTP_SERVER_LOGIN=foo | 250 | ;SMTP_SERVER_LOGIN=foo |
251 | ;SMTP_SERVER_PASSWORD=bar | 251 | ;SMTP_SERVER_PASSWORD=bar |
252 | 252 | ||
253 | [Communications] | ||
254 | 253 | ||
254 | [Communications] | ||
255 | ;InterregionComms = "LocalComms" | 255 | ;InterregionComms = "LocalComms" |
256 | InterregionComms = "RESTComms" | 256 | InterregionComms = "RESTComms" |
257 | 257 | ||
258 | [AutoOAR] | ||
259 | |||
260 | ;Enable the AutoOAR module. | ||
261 | ;OAR's are automatically exported to Regionname_x_y.oar.tar.gz | ||
262 | |||
263 | enabled = false | ||
264 | |||
265 | ;Interval, in minutes, between exports | ||
266 | |||
267 | interval = 20 | ||
268 | |||
269 | 258 | ||
270 | [StandAlone] | 259 | [StandAlone] |
271 | accounts_authenticate = true | 260 | accounts_authenticate = true |
@@ -369,6 +358,7 @@ | |||
369 | ; " (Mozilla Compatible)" to the text where there are problems with a web server | 358 | ; " (Mozilla Compatible)" to the text where there are problems with a web server |
370 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" | 359 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" |
371 | 360 | ||
361 | |||
372 | [ClientStack.LindenUDP] | 362 | [ClientStack.LindenUDP] |
373 | ; This is the multiplier applied to all client throttles for outgoing UDP network data | 363 | ; This is the multiplier applied to all client throttles for outgoing UDP network data |
374 | ; 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 | 364 | ; 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 |