OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: remove mono compiler warnings

prebuild-update
Justin Clark-Casey (justincc) 2010-08-13 23:28:28 +01:00
parent c64bef146b
commit 8acb401a14
10 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -1265,18 +1265,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return handles; return handles;
} }
private void Dump(string msg, List<ulong> handles) // private void Dump(string msg, List<ulong> handles)
{ // {
m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); // m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
foreach (ulong handle in handles) // foreach (ulong handle in handles)
{ // {
uint x, y; // uint x, y;
Utils.LongToUInts(handle, out x, out y); // Utils.LongToUInts(handle, out x, out y);
x = x / Constants.RegionSize; // x = x / Constants.RegionSize;
y = y / Constants.RegionSize; // y = y / Constants.RegionSize;
m_log.InfoFormat("({0}, {1})", x, y); // m_log.InfoFormat("({0}, {1})", x, y);
} // }
} // }
#endregion #endregion

2
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
View File

@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
try try
{ {
asset1.ID = url + "/" + asset.ID; asset1.ID = url + "/" + asset.ID;
UUID temp = UUID.Zero; // UUID temp = UUID.Zero;
// TODO: if the creator is local, stick this grid's URL in front // TODO: if the creator is local, stick this grid's URL in front
//if (UUID.TryParse(asset.Metadata.CreatorID, out temp)) //if (UUID.TryParse(asset.Metadata.CreatorID, out temp))
// asset1.Metadata.CreatorID = ??? + "/" + asset.Metadata.CreatorID; // asset1.Metadata.CreatorID = ??? + "/" + asset.Metadata.CreatorID;

4
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
get { return m_assMapper; } get { return m_assMapper; }
} }
private bool m_Initialized = false; // private bool m_Initialized = false;
#region INonSharedRegionModule #region INonSharedRegionModule

16
OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
private static bool m_HasRunOnce = false; private static bool m_HasRunOnce = false;
private bool m_Enabled = false; private bool m_Enabled = false;
private string m_LibraryName = "OpenSim Library"; // private string m_LibraryName = "OpenSim Library";
private Scene m_Scene; private Scene m_Scene;
private ILibraryService m_Library; private ILibraryService m_Library;
@ -212,13 +212,13 @@ namespace OpenSim.Region.CoreModules.Framework.Library
} }
} }
private void DumpLibrary() // private void DumpLibrary()
{ // {
InventoryFolderImpl lib = m_Library.LibraryRootFolder; // InventoryFolderImpl lib = m_Library.LibraryRootFolder;
//
m_log.DebugFormat(" - folder {0}", lib.Name); // m_log.DebugFormat(" - folder {0}", lib.Name);
DumpFolder(lib); // DumpFolder(lib);
} // }
// //
// private void DumpLibrary() // private void DumpLibrary()
// { // {

33
OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
View File

@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
private string httpsCN = ""; private string httpsCN = "";
private bool httpSSL = false; private bool httpSSL = false;
private uint httpsslport = 0; private uint httpsslport = 0;
private bool GridMode = false; // private bool GridMode = false;
#region IRegionModule Members #region IRegionModule Members
@ -126,10 +126,10 @@ namespace OpenSim.Region.CoreModules.InterGrid
} }
if (startupcfg != null) // if (startupcfg != null)
{ // {
GridMode = enabled = startupcfg.GetBoolean("gridmode", false); // GridMode = enabled = startupcfg.GetBoolean("gridmode", false);
} // }
if (cfg != null) if (cfg != null)
{ {
@ -1213,18 +1213,19 @@ namespace OpenSim.Region.CoreModules.InterGrid
} }
} }
private string CreateRandomStr(int len) // private string CreateRandomStr(int len)
{ // {
Random rnd = new Random(Environment.TickCount); // Random rnd = new Random(Environment.TickCount);
string returnstring = ""; // string returnstring = "";
string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; // string chars = "abcdefghijklmnopqrstuvwxyz0123456789";
//
// for (int i = 0; i < len; i++)
// {
// returnstring += chars.Substring(rnd.Next(chars.Length), 1);
// }
// return returnstring;
// }
for (int i = 0; i < len; i++)
{
returnstring += chars.Substring(rnd.Next(chars.Length), 1);
}
return returnstring;
}
// Temporary hack to allow teleporting to and from Vaak // Temporary hack to allow teleporting to and from Vaak
private static bool customXertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error) private static bool customXertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error)
{ {

5
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
View File

@ -32,7 +32,6 @@ using System.Reflection;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Services.Connectors; using OpenSim.Services.Connectors;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private bool m_Enabled = false; private bool m_Enabled = false;
private bool m_Initialized = false; private bool m_Initialized = false;
private Scene m_Scene; // private Scene m_Scene;
private InventoryServicesConnector m_RemoteConnector; private InventoryServicesConnector m_RemoteConnector;
public Type ReplaceableInterface public Type ReplaceableInterface
@ -105,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
m_Scene = scene; // m_Scene = scene;
//m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
if (!m_Enabled) if (!m_Enabled)

5
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
View File

@ -32,7 +32,6 @@ using System.Reflection;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Services.Connectors; using OpenSim.Services.Connectors;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private bool m_Enabled = false; private bool m_Enabled = false;
private bool m_Initialized = false; private bool m_Initialized = false;
private Scene m_Scene; // private Scene m_Scene;
private XInventoryServicesConnector m_RemoteConnector; private XInventoryServicesConnector m_RemoteConnector;
public Type ReplaceableInterface public Type ReplaceableInterface
@ -109,7 +108,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
m_Scene = scene; // m_Scene = scene;
//m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
if (!m_Enabled) if (!m_Enabled)

12
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -139,12 +139,12 @@ namespace OpenSim.Region.CoreModules.World.Land
{ {
} }
private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason) // private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
{ // {
ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y); // ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
reason = "You are not allowed to enter this sim."; // reason = "You are not allowed to enter this sim.";
return nearestParcel != null; // return nearestParcel != null;
} // }
void EventManagerOnNewClient(IClientAPI client) void EventManagerOnNewClient(IClientAPI client)
{ {

2
OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BuySellModule")] [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BuySellModule")]
public class BuySellModule : IBuySellModule, INonSharedRegionModule public class BuySellModule : IBuySellModule, INonSharedRegionModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Scene m_scene = null; protected Scene m_scene = null;
protected IDialogModule m_dialogModule; protected IDialogModule m_dialogModule;

18
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
View File

@ -138,14 +138,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
remoteClient.SendMapBlock(blocks, 2); remoteClient.SendMapBlock(blocks, 2);
} }
private Scene GetClientScene(IClientAPI client) // private Scene GetClientScene(IClientAPI client)
{ // {
foreach (Scene s in m_scenes) // foreach (Scene s in m_scenes)
{ // {
if (client.Scene.RegionInfo.RegionHandle == s.RegionInfo.RegionHandle) // if (client.Scene.RegionInfo.RegionHandle == s.RegionInfo.RegionHandle)
return s; // return s;
} // }
return m_scene; // return m_scene;
} // }
} }
} }