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

remove mono compiler warnings

bulletsim
Justin Clark-Casey (justincc) 2011-08-23 21:41:16 +01:00
parent 805ba268d5
commit 014cd4f8bb
9 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
View File

@ -130,8 +130,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
m_attMod.RezSingleAttachmentFromInventory( m_attMod.RezSingleAttachmentFromInventory(
presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest);
// ###
m_attMod.ShowDetachInUserInventory(attItemId, presence.ControllingClient); m_attMod.ShowDetachInUserInventory(attItemId, presence.ControllingClient);
// Check status on scene presence // Check status on scene presence

4
OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
View File

@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
private static bool m_Enabled = false; private static bool m_Enabled = false;
private IConfigSource m_Config; private IConfigSource m_Config;
bool m_Registered = false;
#region IRegionModule interface #region IRegionModule interface
@ -64,9 +63,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
m_log.Info("[MAP SERVICE IN CONNECTOR]: MapImage Service In Connector enabled"); m_log.Info("[MAP SERVICE IN CONNECTOR]: MapImage Service In Connector enabled");
new MapGetServiceConnector(m_Config, MainServer.Instance, "MapImageService"); new MapGetServiceConnector(m_Config, MainServer.Instance, "MapImageService");
} }
} }
} }
public void PostInitialise() public void PostInitialise()
@ -106,6 +103,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
} }
#endregion #endregion
} }
} }

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
View File

@ -125,7 +125,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
bool isAuthorized = true; bool isAuthorized = true;
message = String.Empty; message = String.Empty;
string mail = String.Empty;
// get the scene this call is being made for // get the scene this call is being made for
Scene scene = null; Scene scene = null;
@ -144,9 +143,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
{ {
UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID)); UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID));
if (account != null)
mail = account.Email;
isAuthorized isAuthorized
= IsAuthorizedForRegion( = IsAuthorizedForRegion(
userID, firstName, lastName, account.Email, scene.RegionInfo.RegionName, regionID, out message); userID, firstName, lastName, account.Email, scene.RegionInfo.RegionName, regionID, out message);

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{ {
// m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID); // m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID);
UUID requestedItemId = item.ID; // UUID requestedItemId = item.ID;
item = m_InventoryService.GetItem(item); item = m_InventoryService.GetItem(item);

1
OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
View File

@ -61,7 +61,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
private bool m_enabled = false; private bool m_enabled = false;
private IMapImageService m_MapService; private IMapImageService m_MapService;
private string m_serverUrl = String.Empty;
private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
private int m_refreshtime = 0; private int m_refreshtime = 0;

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
View File

@ -39,7 +39,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
{ {
public class PresenceDetector public class PresenceDetector
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IPresenceService m_PresenceService; private IPresenceService m_PresenceService;
private Scene m_aScene; private Scene m_aScene;

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

@ -743,7 +743,7 @@ namespace OpenSim.Region.CoreModules.World.Land
// Corner case. If an autoreturn happens during sim startup // Corner case. If an autoreturn happens during sim startup
// we will come here with the list uninitialized // we will come here with the list uninitialized
// //
int landId = m_landIDList[x, y]; // int landId = m_landIDList[x, y];
// if (landId == 0) // if (landId == 0)
// m_log.DebugFormat( // m_log.DebugFormat(

2
OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public class PrimCountModule : IPrimCountModule, INonSharedRegionModule public class PrimCountModule : IPrimCountModule, INonSharedRegionModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_Scene; private Scene m_Scene;
private Dictionary<UUID, PrimCounts> m_PrimCounts = private Dictionary<UUID, PrimCounts> m_PrimCounts =

1
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -435,7 +435,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
List<ILandObject> parcels = landChannel.AllParcels(); List<ILandObject> parcels = landChannel.AllParcels();
// Local Map Item Request // Local Map Item Request
int tc = Environment.TickCount;
List<mapItemReply> mapitems = new List<mapItemReply>(); List<mapItemReply> mapitems = new List<mapItemReply>();
mapItemReply mapitem = new mapItemReply(); mapItemReply mapitem = new mapItemReply();
if ((parcels != null) && (parcels.Count >= 1)) if ((parcels != null) && (parcels.Count >= 1))