From 748f72326d9a295958bc9ba63bbb1a5d39030ef7 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 27 Jun 2008 23:03:39 +0000
Subject: last round of warning squashing. calling it a day now.
---
OpenSim/Grid/AssetServer/RestService.cs | 10 +++---
OpenSim/Grid/MessagingServer/Main.cs | 2 +-
OpenSim/Grid/MessagingServer/MessageService.cs | 12 +++----
OpenSim/Grid/MessagingServer/PresenceInformer.cs | 3 +-
OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 4 +--
.../ScriptServer/Region/RegionConnectionManager.cs | 8 ++---
.../ScriptServer/ScriptEnginesManager.cs | 4 +--
OpenSim/Grid/UserServer/MessageServersConnector.cs | 12 +++----
OpenSim/Grid/UserServer/UserManager.cs | 40 +++++++++++-----------
9 files changed, 48 insertions(+), 47 deletions(-)
(limited to 'OpenSim/Grid')
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index e0e5656..98f86f1 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Grid.AssetServer
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private OpenAsset_Main m_assetManager;
+ // private OpenAsset_Main m_assetManager;
private IAssetProvider m_assetProvider;
/// <summary>
@@ -56,7 +56,7 @@ namespace OpenSim.Grid.AssetServer
: base("GET", "/assets")
{
m_log.Info("[REST]: In Get Request");
- m_assetManager = assetManager;
+ // m_assetManager = assetManager;
m_assetProvider = assetProvider;
}
@@ -120,7 +120,7 @@ namespace OpenSim.Grid.AssetServer
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private OpenAsset_Main m_assetManager;
+ // private OpenAsset_Main m_assetManager;
private IAssetProvider m_assetProvider;
public override byte[] Handle(string path, Stream request,
@@ -131,7 +131,7 @@ namespace OpenSim.Grid.AssetServer
LLUUID assetId;
if (param.Length > 0)
LLUUID.TryParse(param, out assetId);
- byte[] txBuffer = new byte[4096];
+ // byte[] txBuffer = new byte[4096];
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
AssetBase asset = (AssetBase) xs.Deserialize(request);
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.AssetServer
public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
: base("POST", "/assets")
{
- m_assetManager = assetManager;
+ // m_assetManager = assetManager;
m_assetProvider = assetProvider;
}
}
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 91f2101..781b49b 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer
private MessageServerConfig Cfg;
private MessageService msgsvc;
- private LLUUID m_lastCreatedUser = LLUUID.Random();
+ // private LLUUID m_lastCreatedUser = LLUUID.Random();
[STAThread]
public static void Main(string[] args)
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index cec596f..7be62b0 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.MessagingServer
private Hashtable m_presence_BackReferences = new Hashtable();
// Hashtable containing work units that need to be processed
- private Hashtable m_unProcessedWorkUnits = new Hashtable();
+ // private Hashtable m_unProcessedWorkUnits = new Hashtable();
public MessageService(MessageServerConfig cfg)
{
@@ -588,9 +588,9 @@ namespace OpenSim.Grid.MessagingServer
uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
string internalIpStr = (string)responseData["sim_ip"];
- uint port = Convert.ToUInt32(responseData["sim_port"]);
- string externalUri = (string)responseData["sim_uri"];
- string neighbourExternalUri = externalUri;
+ // uint port = Convert.ToUInt32(responseData["sim_port"]);
+ // string externalUri = (string)responseData["sim_uri"];
+ // string neighbourExternalUri = externalUri;
regionProfile = new RegionProfileData();
regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
@@ -655,7 +655,7 @@ namespace OpenSim.Grid.MessagingServer
throw(ex);
}
Hashtable GridRespData = (Hashtable)UserResp.Value;
- Hashtable griddatahash = GridRespData;
+ // Hashtable griddatahash = GridRespData;
// Process Response
if (GridRespData.ContainsKey("responsestring"))
@@ -704,7 +704,7 @@ namespace OpenSim.Grid.MessagingServer
throw (ex);
}
Hashtable UserRespData = (Hashtable)UserResp.Value;
- Hashtable userdatahash = UserRespData;
+ // Hashtable userdatahash = UserRespData;
// Process Response
if (UserRespData.ContainsKey("responsestring"))
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index e02aa06..39fcadb 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -118,7 +118,8 @@ namespace OpenSim.Grid.MessagingServer
try
{
- XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
+ // XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
+ RegionReq.Send(whichRegion.httpServerURI, 6000);
}
catch (WebException)
{
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index efe077d..13bf290 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.MessagingServer
public class PostXMPPStreamHandler : BaseStreamHandler
{
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.MessagingServer
LLUUID assetId;
if (param.Length > 0)
LLUUID.TryParse(param, out assetId);
- byte[] txBuffer = new byte[4096];
+ // byte[] txBuffer = new byte[4096];
// TODO: Read POST serialize XMPP stanzas
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index 8c31b9b..97be5c3 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -29,13 +29,13 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
{
public class RegionConnectionManager : RegionBase
{
- private ScriptServerMain m_ScriptServerMain;
- private object m_Connection;
+ // private ScriptServerMain m_ScriptServerMain;
+ // private object m_Connection;
public RegionConnectionManager(ScriptServerMain scm, object Connection)
{
- m_ScriptServerMain = scm;
- m_Connection = Connection;
+ // m_ScriptServerMain = scm;
+ // m_Connection = Connection;
}
}
}
\ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
index 9d67602..37fbcfb 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
@@ -34,12 +34,12 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
{
private ScriptEngineLoader ScriptEngineLoader;
private List<ScriptServerInterfaces.ScriptEngine> scriptEngines = new List<ScriptServerInterfaces.ScriptEngine>();
- private ScriptServerMain m_ScriptServerMain;
+ // private ScriptServerMain m_ScriptServerMain;
// Initialize
public ScriptEngineManager(ScriptServerMain scm)
{
- m_ScriptServerMain = scm;
+ // m_ScriptServerMain = scm;
ScriptEngineLoader = new ScriptEngineLoader();
}
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 208131e..b3f8b19 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -140,12 +140,12 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("fromuri"))
{
- string sURI = (string)requestData["fromuri"];
- string sagentID = (string)requestData["agentid"];
- string ssessionID = (string)requestData["sessionid"];
- string scurrentRegionID = (string)requestData["regionid"];
- string sregionhandle = (string)requestData["regionhandle"];
- string scurrentpos = (string)requestData["currentpos"];
+ // string sURI = (string)requestData["fromuri"];
+ // string sagentID = (string)requestData["agentid"];
+ // string ssessionID = (string)requestData["sessionid"];
+ // string scurrentRegionID = (string)requestData["regionid"];
+ // string sregionhandle = (string)requestData["regionhandle"];
+ // string scurrentpos = (string)requestData["currentpos"];
//LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
// TODO: Okay now raise event so the user server can pass this data to the Usermanager
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 907a530..d4fb187 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Grid.UserServer
public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request)
{
- XmlRpcResponse response = new XmlRpcResponse();
+ // XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable) request.Params[0];
List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>();
LLUUID queryID = new LLUUID(LLUUID.Zero.ToString());
@@ -188,25 +188,25 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("avatar_id") && requestData.Contains("region_handle") && requestData.Contains("region_uuid"))
{
- ulong cregionhandle = 0;
+ // ulong cregionhandle = 0;
LLUUID regionUUID = LLUUID.Zero;
LLUUID AvatarID = LLUUID.Zero;
Helpers.TryParse((string)requestData["avatar_id"], out AvatarID);
Helpers.TryParse((string)requestData["region_uuid"], out regionUUID);
- try
- {
- cregionhandle = (ulong)Convert.ToInt64((string)requestData["region_handle"]);
- }
- catch (ArgumentException)
- {
- }
- catch (OverflowException)
- {
- }
- catch (FormatException)
- {
- }
+ // try
+ // {
+ // cregionhandle = (ulong)Convert.ToInt64((string)requestData["region_handle"]);
+ // }
+ // catch (ArgumentException)
+ // {
+ // }
+ // catch (OverflowException)
+ // {
+ // }
+ // catch (FormatException)
+ // {
+ // }
if (AvatarID != LLUUID.Zero)
{
@@ -285,9 +285,9 @@ namespace OpenSim.Grid.UserServer
public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request)
{
- XmlRpcResponse response = new XmlRpcResponse();
+ // XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0];
- Hashtable responseData = new Hashtable();
+ // Hashtable responseData = new Hashtable();
List<FriendListItem> returndata = new List<FriendListItem>();
@@ -354,14 +354,14 @@ namespace OpenSim.Grid.UserServer
public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request)
{
- XmlRpcResponse response = new XmlRpcResponse();
+ // XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable) request.Params[0];
UserProfileData userProfile;
if (requestData.Contains("avatar_name"))
{
string query = (string) requestData["avatar_name"];
- Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
+ // Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
string[] querysplit;
querysplit = query.Split(' ');
@@ -389,7 +389,7 @@ namespace OpenSim.Grid.UserServer
public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request)
{
- XmlRpcResponse response = new XmlRpcResponse();
+ // XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable) request.Params[0];
UserProfileData userProfile;
//CFK: this clogs the UserServer log and is not necessary at this time.
--
cgit v1.1