aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs4
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 50b65f6..235d7c5 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
52 52
53 ug.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids); 53 ug.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids);
54 54
55 // We count the uuid as gathered even if the asset itself is missing.
55 Assert.That(foundAssetUuids.Count, Is.EqualTo(1)); 56 Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
56 } 57 }
57 } 58 }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs
index 4c2a4b9..cfe1278 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 private IRCServer m_server; 42 private IRCServer m_server;
43 private Scene m_scene; 43// private Scene m_scene;
44 44
45 #region Implementation of IRegionModule 45 #region Implementation of IRegionModule
46 46
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView
50 source.Configs["IRCd"].GetBoolean("Enabled",false)) 50 source.Configs["IRCd"].GetBoolean("Enabled",false))
51 { 51 {
52 int portNo = source.Configs["IRCd"].GetInt("Port",6666); 52 int portNo = source.Configs["IRCd"].GetInt("Port",6666);
53 m_scene = scene; 53// m_scene = scene;
54 m_server = new IRCServer(IPAddress.Parse("0.0.0.0"), portNo, scene); 54 m_server = new IRCServer(IPAddress.Parse("0.0.0.0"), portNo, scene);
55 m_server.OnNewIRCClient += m_server_OnNewIRCClient; 55 m_server.OnNewIRCClient += m_server_OnNewIRCClient;
56 } 56 }