From f0bfb879798e87296e13063203d5b18a1aa1097f Mon Sep 17 00:00:00 2001
From: Johan Berntsson
Date: Tue, 11 Mar 2008 04:40:39 +0000
Subject: Eliminated several compiler warning messages
---
OpenSim/Region/Application/OpenSimMain.cs | 14 +--
ThirdParty/3Di/LoadBalancer/TcpClient.cs | 7 +-
ThirdParty/3Di/LoadBalancer/TcpServer.cs | 18 ---
.../ServerPlugin/RegionMonitorPlugin.cs | 129 ---------------------
4 files changed, 5 insertions(+), 163 deletions(-)
delete mode 100644 ThirdParty/3Di/RegionMonitor/ServerPlugin/RegionMonitorPlugin.cs
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 33d0999..fd3a57f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -521,11 +521,6 @@ namespace OpenSim
return udpServer;
}
- private static void CreateDefaultRegionInfoXml(string fileName)
- {
- new RegionInfo("DEFAULT REGION CONFIG", fileName,false);
- }
-
protected override StorageManager CreateStorageManager(string connectionstring)
{
return new StorageManager(m_storageDll, connectionstring, m_storagePersistPrimInventories);
@@ -1254,14 +1249,7 @@ namespace OpenSim
/// The first out parameter describing the number of all the avatars in the Region server
public void GetAvatarNumber(out int usernum)
{
- int accounter = 0;
-
- foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars()) {
- //presence.RegionHandle;
- accounter++;
- }
-
- usernum = accounter;
+ usernum = m_sceneManager.GetCurrentSceneAvatars().Count;
}
///
diff --git a/ThirdParty/3Di/LoadBalancer/TcpClient.cs b/ThirdParty/3Di/LoadBalancer/TcpClient.cs
index 2e4cdc7..ab1f692 100644
--- a/ThirdParty/3Di/LoadBalancer/TcpClient.cs
+++ b/ThirdParty/3Di/LoadBalancer/TcpClient.cs
@@ -37,8 +37,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
public class AsynchronousClient {
private static ManualResetEvent connectDone = new ManualResetEvent(false);
private static ManualResetEvent sendDone = new ManualResetEvent(false);
- private static ManualResetEvent receiveDone = new ManualResetEvent(false);
- private static String response = String.Empty;
public static Socket StartClient(string hostname, int port) {
try {
@@ -114,7 +112,10 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
try {
Socket client = (Socket) ar.AsyncState;
int bytesSent = client.EndSend(ar);
- //Console.WriteLine("Sent {0} bytes to server.", bytesSent);
+ if(bytesSent > 0)
+ {
+ //Console.WriteLine("Sent {0} bytes to server.", bytesSent);
+ }
sendDone.Set();
} catch (Exception e) {
Console.WriteLine(e.ToString());
diff --git a/ThirdParty/3Di/LoadBalancer/TcpServer.cs b/ThirdParty/3Di/LoadBalancer/TcpServer.cs
index 2d46294..216db3b 100644
--- a/ThirdParty/3Di/LoadBalancer/TcpServer.cs
+++ b/ThirdParty/3Di/LoadBalancer/TcpServer.cs
@@ -89,7 +89,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
}
public static void ReadCallback(IAsyncResult ar) {
- String content = String.Empty;
StateObject state = (StateObject) ar.AsyncState;
Socket handler = state.workSocket;
@@ -183,23 +182,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
handler.BeginReceive( state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReadCallback), state);
}
-
- private static void Send(Socket handler, String data) {
- byte[] byteData = Encoding.ASCII.GetBytes(data);
- handler.BeginSend(byteData, 0, byteData.Length, 0, new AsyncCallback(SendCallback), handler);
- }
-
- private static void SendCallback(IAsyncResult ar) {
- try {
- Socket handler = (Socket) ar.AsyncState;
- int bytesSent = handler.EndSend(ar);
- //Console.WriteLine("Sent {0} bytes to client.", bytesSent);
- handler.Shutdown(SocketShutdown.Both);
- handler.Close();
- } catch (Exception e) {
- Console.WriteLine(e.ToString());
- }
- }
}
public class TcpServer {
diff --git a/ThirdParty/3Di/RegionMonitor/ServerPlugin/RegionMonitorPlugin.cs b/ThirdParty/3Di/RegionMonitor/ServerPlugin/RegionMonitorPlugin.cs
deleted file mode 100644
index 3ea19a0..0000000
--- a/ThirdParty/3Di/RegionMonitor/ServerPlugin/RegionMonitorPlugin.cs
+++ /dev/null
@@ -1,129 +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 OpenSim 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.Runtime.Remoting;
-using System.Threading;
-using Mono.Addins;
-using OpenSim;
-using OpenSim.Framework.Console;
-using MonitorLib;
-
-[assembly:Addin]
-[assembly:AddinDependency ("OpenSim", "0.5")]
-
-namespace OpenSim.ApplicationPlugins.RegionMonitor
-{
- [Extension("/OpenSim/Startup")]
- public class RegionMonitorPlugin : MonitorLibBase, IApplicationPlugin
- {
- protected Thread m_mointorThread;
- protected static OpenSimMain m_openSimMain;
-
- public void Initialise(OpenSimMain opensim)
- {
- m_openSimMain = opensim;
- Start();
- MainLog.Instance.Verbose("Monitor", "Region monitor is runing ...");
- }
-
- public void Close()
- {
- }
-
- public void Start()
- {
- // start monitor thread (remoting module)
- m_mointorThread = new Thread(new ThreadStart(StartMonitor));
- m_mointorThread.IsBackground = true;
- m_mointorThread.Start();
- }
-
- private void StartMonitor()
- {
- try
- {
- Object lockObj = new Object();
-
- RemotingConfiguration.Configure("monitorS.config", false);
-
- lock (lockObj)
- {
- System.Threading.Monitor.Wait(lockObj);
- }
- }
- catch (Exception e)
- {
- MainLog.Instance.Warn("MONITOR", "Error - " + e.Message);
- }
- }
-
- public override bool FetchInfo(out string outstr)
- {
- MainLog.Instance.Verbose("MONITOR", "Fetch Information from Region server");
- bool status = true;
- string startTime = "";
- string upTime = "";
- int userNumber = 0;
- int regionNumber = 0;
- m_openSimMain.GetRunTime(out startTime, out upTime);
- m_openSimMain.GetAvatarNumber(out userNumber);
- m_openSimMain.GetRegionNumber(out regionNumber);
- outstr = startTime
- + "," + upTime
- + "," + regionNumber
- + "," + userNumber;
- return status;
- }
-
-
- public override bool MoveRegion()
- {
- MainLog.Instance.Verbose("MONITOR", "Move Region");
- bool status = true;
-
- return status;
- }
-
- public override bool SplitRegion()
- {
- MainLog.Instance.Verbose("MONITOR", "Split Region");
- bool status = true;
-
- return status;
- }
-
- public override bool MergeScenes()
- {
- MainLog.Instance.Verbose("MONITOR", "Merge Scenes");
- bool status = true;
-
- return status;
- }
-
- }
-}
--
cgit v1.1