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

minor: remove some mono compiler warnings

trunk
Justin Clarke Casey 2009-07-15 20:49:58 +00:00
parent d89cf47d50
commit 5815162d7e
11 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/RegionInfo.cs
View File

@ -427,7 +427,7 @@ namespace OpenSim.Framework
if (name == String.Empty) if (name == String.Empty)
throw new Exception("Cannot interactively create region with no name"); throw new Exception("Cannot interactively create region with no name");
IConfig newRegion = source.AddConfig(name); source.AddConfig(name);
creatingNew = true; creatingNew = true;
} }
@ -437,7 +437,7 @@ namespace OpenSim.Framework
if (source.Configs[name] == null) if (source.Configs[name] == null)
{ {
IConfig newRegion = source.AddConfig(name); source.AddConfig(name);
creatingNew = true; creatingNew = true;
} }

3
OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
View File

@ -93,10 +93,9 @@ namespace OpenSim.Framework.Servers.Tests
[Test] [Test]
public void TestHandleFetchMissingAsset() public void TestHandleFetchMissingAsset()
{ {
IAssetCache assetCache = new TestAssetCache();
CachedGetAssetStreamHandler handler; CachedGetAssetStreamHandler handler;
OSHttpResponse response; OSHttpResponse response;
AssetBase asset = CreateTestEnvironment(out handler, out response); CreateTestEnvironment(out handler, out response);
GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response);
} }

2
OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.Framework.Servers.Tests
{ {
GetAssetStreamHandler handler; GetAssetStreamHandler handler;
OSHttpResponse response; OSHttpResponse response;
AssetBase asset = CreateTestEnvironment(out handler, out response); CreateTestEnvironment(out handler, out response);
GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response);
} }

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
View File

@ -48,8 +48,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
private bool m_Enabled = false; private bool m_Enabled = false;
private LocalNeighbourServicesConnector m_LocalService; private LocalNeighbourServicesConnector m_LocalService;
private string serviceDll; //private string serviceDll;
private List<Scene> m_Scenes = new List<Scene>(); //private List<Scene> m_Scenes = new List<Scene>();
public Type ReplacableInterface public Type ReplacableInterface
{ {

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -145,8 +145,6 @@ namespace OpenSim.Region.Framework.Scenes
private Vector3 m_lastVelocity = Vector3.Zero; private Vector3 m_lastVelocity = Vector3.Zero;
private int m_maxPrimsPerFrame = 200;
// Default AV Height // Default AV Height
private float m_avHeight = 127.0f; private float m_avHeight = 127.0f;

2
OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
View File

@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestConstructor() public void TestConstructor()
{ {
SceneBase scene = new SceneBaseImpl(); new SceneBaseImpl();
} }
} }
} }

2
OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
View File

@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
RegionInfo regionInfo = new RegionInfo(0,0,null,null); RegionInfo regionInfo = new RegionInfo(0,0,null,null);
FakeStorageManager storageManager = new FakeStorageManager(); FakeStorageManager storageManager = new FakeStorageManager();
Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null);
} }
} }
} }

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
View File

@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
private readonly Scene m_rootScene; private readonly Scene m_rootScene;
private readonly UUID m_ID; private readonly UUID m_ID;
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public SPAvatar(Scene scene, UUID ID) public SPAvatar(Scene scene, UUID ID)
{ {

8
OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs
View File

@ -35,17 +35,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
public class SPAvatarAttachment : IAvatarAttachment public class SPAvatarAttachment : IAvatarAttachment
{ {
private readonly Scene m_rootScene; private readonly Scene m_rootScene;
private readonly IAvatar m_parent; //private readonly IAvatar m_parent;
private readonly int m_location; private readonly int m_location;
private readonly UUID m_itemId; //private readonly UUID m_itemId;
private readonly UUID m_assetId; private readonly UUID m_assetId;
public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId) public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId)
{ {
m_rootScene = rootScene; m_rootScene = rootScene;
m_parent = self; //m_parent = self;
m_location = location; m_location = location;
m_itemId = itemId; //m_itemId = itemId;
m_assetId = assetId; m_assetId = assetId;
} }

2
OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset
{ {
TestHelper.InMethod(); TestHelper.InMethod();
AssetServerGetHandler handler = new AssetServerGetHandler(null); new AssetServerGetHandler(null);
} }
[Test] [Test]

8
OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
View File

@ -43,13 +43,13 @@ namespace OpenSim.Services.Connectors
/// </summary> /// </summary>
public class QuickAndDirtyInventoryServiceConnector : IInventoryService public class QuickAndDirtyInventoryServiceConnector : IInventoryService
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty; private string m_ServerURI = String.Empty;
private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory = new Dictionary<UUID, InventoryReceiptCallback>(); //private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory = new Dictionary<UUID, InventoryReceiptCallback>();
public QuickAndDirtyInventoryServiceConnector() public QuickAndDirtyInventoryServiceConnector()
{ {