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

warnings safari.

remotes/origin/0.6.7-post-fixes
dr scofield (aka dirk husemann) 2009-09-02 09:43:22 +02:00
parent 078303af15
commit 05756e1fb9
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Tests
CachedUserInfo nonExistingUserInfo; CachedUserInfo nonExistingUserInfo;
TestCommunicationsManager commsManager = new TestCommunicationsManager(); TestCommunicationsManager commsManager = new TestCommunicationsManager();
Scene myScene = SceneSetupHelpers.SetupScene(commsManager, ""); // Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
// Check we can't retrieve info before it exists by uuid // Check we can't retrieve info before it exists by uuid
nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);

5
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -93,12 +93,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
string userFirstName = "Jock"; string userFirstName = "Jock";
string userLastName = "Stirrup"; string userLastName = "Stirrup";
UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
CachedUserInfo userInfo; // CachedUserInfo userInfo;
lock (this) lock (this)
{ {
userInfo UserProfileTestUtils.CreateUserWithInventory(
= UserProfileTestUtils.CreateUserWithInventory(
cm, userFirstName, userLastName, userId, InventoryReceived); cm, userFirstName, userLastName, userId, InventoryReceived);
Monitor.Wait(this, 60000); Monitor.Wait(this, 60000);
} }

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

@ -44,7 +44,9 @@ namespace OpenSim.Region.CoreModules.World.Land
#region Member Variables #region Member Variables
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#pragma warning disable 0429
private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64;
#pragma warning restore 0429
private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax];
protected LandData m_landData = new LandData(); protected LandData m_landData = new LandData();

4
OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
View File

@ -658,8 +658,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public class LargeLandChannel : ILandChannel public class LargeLandChannel : ILandChannel
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private RegionData RegData; private RegionData RegData;
private ILandChannel RootRegionLandChannel; private ILandChannel RootRegionLandChannel;
private readonly List<RegionData> RegionConnections; private readonly List<RegionData> RegionConnections;

4
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -85,7 +85,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
private static string m_freeSwitchRealm; private static string m_freeSwitchRealm;
private static string m_freeSwitchSIPProxy; private static string m_freeSwitchSIPProxy;
private static bool m_freeSwitchAttemptUseSTUN; private static bool m_freeSwitchAttemptUseSTUN;
private static string m_freeSwitchSTUNServer; // private static string m_freeSwitchSTUNServer;
private static string m_freeSwitchEchoServer; private static string m_freeSwitchEchoServer;
private static int m_freeSwitchEchoPort; private static int m_freeSwitchEchoPort;
private static string m_freeSwitchDefaultWellKnownIP; private static string m_freeSwitchDefaultWellKnownIP;
@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty); m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty);
m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm); m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm);
m_freeSwitchAttemptUseSTUN = m_config.GetBoolean("freeswitch_attempt_stun", true); m_freeSwitchAttemptUseSTUN = m_config.GetBoolean("freeswitch_attempt_stun", true);
m_freeSwitchSTUNServer = m_config.GetString("freeswitch_stun_server", m_freeSwitchRealm); // m_freeSwitchSTUNServer = m_config.GetString("freeswitch_stun_server", m_freeSwitchRealm);
m_freeSwitchEchoServer = m_config.GetString("freeswitch_echo_server", m_freeSwitchRealm); m_freeSwitchEchoServer = m_config.GetString("freeswitch_echo_server", m_freeSwitchRealm);
m_freeSwitchEchoPort = m_config.GetInt("freeswitch_echo_port", 50505); m_freeSwitchEchoPort = m_config.GetInt("freeswitch_echo_port", 50505);
m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm); m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm);

10
OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
View File

@ -43,11 +43,11 @@ namespace OpenSim.Tests.Common.Mock
} }
private IUserDataPlugin m_userDataPlugin; private IUserDataPlugin m_userDataPlugin;
public IInventoryDataPlugin InventoryDataPlugin // public IInventoryDataPlugin InventoryDataPlugin
{ // {
get { return m_inventoryDataPlugin; } // get { return m_inventoryDataPlugin; }
} // }
private IInventoryDataPlugin m_inventoryDataPlugin; // private IInventoryDataPlugin m_inventoryDataPlugin;
public TestCommunicationsManager() public TestCommunicationsManager()
: this(null) : this(null)

2
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup
godsModule.Initialise(testScene, new IniConfigSource()); godsModule.Initialise(testScene, new IniConfigSource());
testScene.AddModule(godsModule.Name, godsModule); testScene.AddModule(godsModule.Name, godsModule);
realServices = realServices.ToLower(); realServices = realServices.ToLower();
IConfigSource config = new IniConfigSource(); // IConfigSource config = new IniConfigSource();
// If we have a brand new scene, need to initialize shared region modules // If we have a brand new scene, need to initialize shared region modules
if ((m_assetService == null && m_inventoryService == null) || newScene) if ((m_assetService == null && m_inventoryService == null) || newScene)