aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs7
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs10
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs2
7 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 2bb0926..e5d8895 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Tests
66 CachedUserInfo nonExistingUserInfo; 66 CachedUserInfo nonExistingUserInfo;
67 67
68 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 68 TestCommunicationsManager commsManager = new TestCommunicationsManager();
69 Scene myScene = SceneSetupHelpers.SetupScene(commsManager, ""); 69 // Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
70 70
71 // Check we can't retrieve info before it exists by uuid 71 // Check we can't retrieve info before it exists by uuid
72 nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); 72 nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 1696d82..066c5d3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -93,13 +93,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
93 string userFirstName = "Jock"; 93 string userFirstName = "Jock";
94 string userLastName = "Stirrup"; 94 string userLastName = "Stirrup";
95 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); 95 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
96 CachedUserInfo userInfo; 96 // CachedUserInfo userInfo;
97 97
98 lock (this) 98 lock (this)
99 { 99 {
100 userInfo 100 UserProfileTestUtils.CreateUserWithInventory(
101 = UserProfileTestUtils.CreateUserWithInventory( 101 cm, userFirstName, userLastName, userId, InventoryReceived);
102 cm, userFirstName, userLastName, userId, InventoryReceived);
103 Monitor.Wait(this, 60000); 102 Monitor.Wait(this, 60000);
104 } 103 }
105 104
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index bb06996..2701f60 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -44,7 +44,9 @@ namespace OpenSim.Region.CoreModules.World.Land
44 #region Member Variables 44 #region Member Variables
45 45
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 #pragma warning disable 0429
47 private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; 48 private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64;
49 #pragma warning restore 0429
48 private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; 50 private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax];
49 51
50 protected LandData m_landData = new LandData(); 52 protected LandData m_landData = new LandData();
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 6a5317b..c525227 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -658,8 +658,8 @@ namespace OpenSim.Region.CoreModules.World.Land
658 658
659 public class LargeLandChannel : ILandChannel 659 public class LargeLandChannel : ILandChannel
660 { 660 {
661 private static readonly ILog m_log = 661 // private static readonly ILog m_log =
662 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 662 // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
663 private RegionData RegData; 663 private RegionData RegData;
664 private ILandChannel RootRegionLandChannel; 664 private ILandChannel RootRegionLandChannel;
665 private readonly List<RegionData> RegionConnections; 665 private readonly List<RegionData> RegionConnections;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index faa0157..65c5274 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
85 private static string m_freeSwitchRealm; 85 private static string m_freeSwitchRealm;
86 private static string m_freeSwitchSIPProxy; 86 private static string m_freeSwitchSIPProxy;
87 private static bool m_freeSwitchAttemptUseSTUN; 87 private static bool m_freeSwitchAttemptUseSTUN;
88 private static string m_freeSwitchSTUNServer; 88 // private static string m_freeSwitchSTUNServer;
89 private static string m_freeSwitchEchoServer; 89 private static string m_freeSwitchEchoServer;
90 private static int m_freeSwitchEchoPort; 90 private static int m_freeSwitchEchoPort;
91 private static string m_freeSwitchDefaultWellKnownIP; 91 private static string m_freeSwitchDefaultWellKnownIP;
@@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
144 m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty); 144 m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty);
145 m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm); 145 m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm);
146 m_freeSwitchAttemptUseSTUN = m_config.GetBoolean("freeswitch_attempt_stun", true); 146 m_freeSwitchAttemptUseSTUN = m_config.GetBoolean("freeswitch_attempt_stun", true);
147 m_freeSwitchSTUNServer = m_config.GetString("freeswitch_stun_server", m_freeSwitchRealm); 147 // m_freeSwitchSTUNServer = m_config.GetString("freeswitch_stun_server", m_freeSwitchRealm);
148 m_freeSwitchEchoServer = m_config.GetString("freeswitch_echo_server", m_freeSwitchRealm); 148 m_freeSwitchEchoServer = m_config.GetString("freeswitch_echo_server", m_freeSwitchRealm);
149 m_freeSwitchEchoPort = m_config.GetInt("freeswitch_echo_port", 50505); 149 m_freeSwitchEchoPort = m_config.GetInt("freeswitch_echo_port", 50505);
150 m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm); 150 m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm);
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index d404344..4313c96 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -43,11 +43,11 @@ namespace OpenSim.Tests.Common.Mock
43 } 43 }
44 private IUserDataPlugin m_userDataPlugin; 44 private IUserDataPlugin m_userDataPlugin;
45 45
46 public IInventoryDataPlugin InventoryDataPlugin 46 // public IInventoryDataPlugin InventoryDataPlugin
47 { 47 // {
48 get { return m_inventoryDataPlugin; } 48 // get { return m_inventoryDataPlugin; }
49 } 49 // }
50 private IInventoryDataPlugin m_inventoryDataPlugin; 50 // private IInventoryDataPlugin m_inventoryDataPlugin;
51 51
52 public TestCommunicationsManager() 52 public TestCommunicationsManager()
53 : this(null) 53 : this(null)
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 360e6b1..0d8baad 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup
163 godsModule.Initialise(testScene, new IniConfigSource()); 163 godsModule.Initialise(testScene, new IniConfigSource());
164 testScene.AddModule(godsModule.Name, godsModule); 164 testScene.AddModule(godsModule.Name, godsModule);
165 realServices = realServices.ToLower(); 165 realServices = realServices.ToLower();
166 IConfigSource config = new IniConfigSource(); 166 // IConfigSource config = new IniConfigSource();
167 167
168 // If we have a brand new scene, need to initialize shared region modules 168 // If we have a brand new scene, need to initialize shared region modules
169 if ((m_assetService == null && m_inventoryService == null) || newScene) 169 if ((m_assetService == null && m_inventoryService == null) || newScene)