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

* Remove some mono compiler warnings

arthursv
Justin Clark-Casey 2009-08-05 17:33:23 +01:00
parent 3323413f53
commit 190bdc8a2e
9 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/AvatarAppearance.cs
View File

@ -38,8 +38,7 @@ namespace OpenSim.Framework
{ {
public class AvatarAppearance public class AvatarAppearance
{ {
private static readonly ILog m_log //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// these are guessed at by the list here - // these are guessed at by the list here -
// http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll // http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll

4
OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
View File

@ -90,8 +90,8 @@ namespace OpenSim.Framework.Communications.Tests
TestHelper.InMethod(); TestHelper.InMethod();
// We want to use our own LoginService for this test, one that // We want to use our own LoginService for this test, one that
// doesn't require authentication. // doesn't require authentication.
LoginService loginService = new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", new TestInventoryService(), new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", new TestInventoryService(),
m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector); m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector);
Hashtable loginParams = new Hashtable(); Hashtable loginParams = new Hashtable();
loginParams["first"] = m_firstName; loginParams["first"] = m_firstName;

4
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -827,9 +827,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode); sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode);
} }
} }
catch (NullReferenceException n) catch (NullReferenceException)
{ {
m_log.Debug("[PACKET] Detected reuse of a returned packet"); m_log.Error("[PACKET]: Detected reuse of a returned packet");
m_PacketQueue.Cancel(item.Sequence); m_PacketQueue.Cancel(item.Sequence);
return; return;
} }

29
OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
View File

@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// </summary> /// </summary>
public class UserTextureDownloadService public class UserTextureDownloadService
{ {
private static readonly ILog m_log // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary> /// <summary>
/// True if the service has been closed, probably because a user with texture requests still queued /// True if the service has been closed, probably because a user with texture requests still queued
@ -88,13 +87,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// XXX This is really a temporary solution to deal with the situation where a client continually requests /// XXX This is really a temporary solution to deal with the situation where a client continually requests
/// the same missing textures /// the same missing textures
/// </summary> /// </summary>
private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy // private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy
= new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); // = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
public UserTextureDownloadService( public UserTextureDownloadService(
IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue) IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue)
{ {
m_client = client; // m_client = client;
m_scene = scene; m_scene = scene;
m_sharedSendersQueue = sharedQueue; m_sharedSendersQueue = sharedQueue;
} }
@ -231,16 +230,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// Place a ready texture sender on the processing queue. /// Place a ready texture sender on the processing queue.
/// </summary> /// </summary>
/// <param name="textureSender"></param> /// <param name="textureSender"></param>
private void EnqueueTextureSender(ITextureSender textureSender) // private void EnqueueTextureSender(ITextureSender textureSender)
{ // {
textureSender.Cancel = false; // textureSender.Cancel = false;
textureSender.Sending = true; // textureSender.Sending = true;
//
if (!m_sharedSendersQueue.Contains(textureSender)) // if (!m_sharedSendersQueue.Contains(textureSender))
{ // {
m_sharedSendersQueue.Enqueue(textureSender); // m_sharedSendersQueue.Enqueue(textureSender);
} // }
} // }
/// <summary> /// <summary>
/// Close this module. /// Close this module.

6
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -60,9 +60,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
public class UrlModule : ISharedRegionModule, IUrlModule public class UrlModule : ISharedRegionModule, IUrlModule
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
private Dictionary<UUID, UrlData> m_RequestMap = private Dictionary<UUID, UrlData> m_RequestMap =
new Dictionary<UUID, UrlData>(); new Dictionary<UUID, UrlData>();

3
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -2863,7 +2863,8 @@ namespace OpenSim.Region.Physics.OdePlugin
//if ((framecount % m_randomizeWater) == 0) //if ((framecount % m_randomizeWater) == 0)
// randomizeWater(waterlevel); // randomizeWater(waterlevel);
int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests(); //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
m_rayCastManager.ProcessQueuedRequests();
collision_optimized(timeStep); collision_optimized(timeStep);

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -9033,7 +9033,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m.Success) { if (m.Success) {
for (int i = 1; i < gnums.Length; i++) { for (int i = 1; i < gnums.Length; i++) {
System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
CaptureCollection cc = g.Captures; //CaptureCollection cc = g.Captures;
} }
if (m.Groups.Count == 5) { if (m.Groups.Count == 5) {
httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));

4
OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs
View File

@ -46,12 +46,12 @@ namespace OpenSim.Server.Handlers.Freeswitch
{ {
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IFreeswitchService m_FreeswitchService; //private IFreeswitchService m_FreeswitchService;
public FreeswitchServerGetHandler(IFreeswitchService service) : public FreeswitchServerGetHandler(IFreeswitchService service) :
base("GET", "/api") base("GET", "/api")
{ {
m_FreeswitchService = service; //m_FreeswitchService = service;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,

4
OpenSim/Services/FreeswitchService/FreeswitchService.cs
View File

@ -38,9 +38,7 @@ namespace OpenSim.Services.FreeswitchService
{ {
public class FreeswitchService : FreeswitchServiceBase, IFreeswitchService public class FreeswitchService : FreeswitchServiceBase, IFreeswitchService
{ {
private static readonly ILog m_log = //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
public FreeswitchService(IConfigSource config) : base(config) public FreeswitchService(IConfigSource config) : base(config)
{ {