diff options
author | Jeff Ames | 2009-02-23 10:36:16 +0000 |
---|---|---|
committer | Jeff Ames | 2009-02-23 10:36:16 +0000 |
commit | f175cb7e8cde5029eeb15f82dbe1613dc9f161c9 (patch) | |
tree | ecf38c3a7defae6431d8bd4f38d890bf7d1f2725 /OpenSim/Client/MXP/MXPModule.cs | |
parent | * Commenting out threaded Scene update for the moment. (diff) | |
download | opensim-SC_OLD-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.zip opensim-SC_OLD-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.tar.gz opensim-SC_OLD-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.tar.bz2 opensim-SC_OLD-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.tar.xz |
Update svn properties, add copyright headers, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Client/MXP/MXPModule.cs')
-rw-r--r-- | OpenSim/Client/MXP/MXPModule.cs | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs index f2b2f66..5873bf4 100644 --- a/OpenSim/Client/MXP/MXPModule.cs +++ b/OpenSim/Client/MXP/MXPModule.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 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; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | using System.Timers; | 31 | using System.Timers; |
@@ -40,12 +67,11 @@ namespace OpenSim.Client.MXP | |||
40 | { | 67 | { |
41 | IConfig con = config.Configs["MXP"]; | 68 | IConfig con = config.Configs["MXP"]; |
42 | 69 | ||
43 | if(!con.GetBoolean("Enabled",false)) | 70 | if (!con.GetBoolean("Enabled", false)) |
44 | return; | 71 | return; |
45 | 72 | ||
46 | mxp_Port = con.GetInt("Port", mxp_Port); | 73 | mxp_Port = con.GetInt("Port", mxp_Port); |
47 | 74 | ||
48 | |||
49 | server = new MXPPacketServer("http://null", mxp_Port, m_scenes); | 75 | server = new MXPPacketServer("http://null", mxp_Port, m_scenes); |
50 | 76 | ||
51 | ticker.AutoReset = false; | 77 | ticker.AutoReset = false; |
@@ -62,7 +88,7 @@ namespace OpenSim.Client.MXP | |||
62 | if (!shutdown) | 88 | if (!shutdown) |
63 | ticker.Start(); | 89 | ticker.Start(); |
64 | 90 | ||
65 | if(++ticks % 100 == 0) | 91 | if (++ticks % 100 == 0) |
66 | { | 92 | { |
67 | server.PrintDebugInformation(); | 93 | server.PrintDebugInformation(); |
68 | } | 94 | } |