aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer.Modules
diff options
context:
space:
mode:
authorJeff Ames2009-03-01 09:15:31 +0000
committerJeff Ames2009-03-01 09:15:31 +0000
commit808e4a847ab699eb3f82cf8bb5de9e4688512426 (patch)
tree2d0eb4827c79a83c304c43dac98a08ea13095f6f /OpenSim/Grid/GridServer.Modules
parentAdded check so Util.ReadSettingsFromIniFile doesn't try to set static fields. (diff)
downloadopensim-SC-808e4a847ab699eb3f82cf8bb5de9e4688512426.zip
opensim-SC-808e4a847ab699eb3f82cf8bb5de9e4688512426.tar.gz
opensim-SC-808e4a847ab699eb3f82cf8bb5de9e4688512426.tar.bz2
opensim-SC-808e4a847ab699eb3f82cf8bb5de9e4688512426.tar.xz
Update svn properties, add copyright headers, minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs32
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs2
2 files changed, 29 insertions, 5 deletions
diff --git a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs
index fd7f4c1..1a4fe72 100644
--- a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs
@@ -1,4 +1,31 @@
1using 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
28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Reflection; 30using System.Reflection;
4using System.Text; 31using System.Text;
@@ -58,7 +85,6 @@ namespace OpenSim.Grid.GridServer.Modules
58 85
59 public void Initialise() 86 public void Initialise()
60 { 87 {
61
62 } 88 }
63 89
64 #endregion 90 #endregion
@@ -134,8 +160,6 @@ namespace OpenSim.Grid.GridServer.Modules
134 160
135 #endregion 161 #endregion
136 162
137
138
139 #region IDisposable Members 163 #region IDisposable Members
140 164
141 public void Dispose() 165 public void Dispose()
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
index 0650a1f..ed5252e 100644
--- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
@@ -400,7 +400,7 @@ namespace OpenSim.Grid.GridServer.Modules
400 // IGridMessagingModule messagingModule; 400 // IGridMessagingModule messagingModule;
401 // if (m_gridCore.TryGet<IGridMessagingModule>(out messagingModule)) 401 // if (m_gridCore.TryGet<IGridMessagingModule>(out messagingModule))
402 //{ 402 //{
403 if(m_messagingServerMapper != null) 403 if (m_messagingServerMapper != null)
404 { 404 {
405 List<MessageServerInfo> messageServers = m_messagingServerMapper.GetMessageServersList(); 405 List<MessageServerInfo> messageServers = m_messagingServerMapper.GetMessageServersList();
406 responseData["messageserver_count"] = messageServers.Count; 406 responseData["messageserver_count"] = messageServers.Count;