aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-29 19:31:48 +0000
committerJustin Clarke Casey2009-04-29 19:31:48 +0000
commit40c2e2e84f50e9a75f26b326a798a280d36687e9 (patch)
tree82487d81c2e8b403b67b2b6978414270df408bc8 /OpenSim/Region
parent* Apply further groups xmlrpc to stop an exception in the exception handler (diff)
downloadopensim-SC_OLD-40c2e2e84f50e9a75f26b326a798a280d36687e9.zip
opensim-SC_OLD-40c2e2e84f50e9a75f26b326a798a280d36687e9.tar.gz
opensim-SC_OLD-40c2e2e84f50e9a75f26b326a798a280d36687e9.tar.bz2
opensim-SC_OLD-40c2e2e84f50e9a75f26b326a798a280d36687e9.tar.xz
* Add test to check temp profile creation on iar load
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs7
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs5
2 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 9bec7ed..d059632 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -257,8 +257,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
257 257
258 Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); 258 Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
259 } 259 }
260 260
261 /*
262 /// <summary> 261 /// <summary>
263 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where 262 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
264 /// no account exists with the creator name 263 /// no account exists with the creator name
@@ -311,7 +310,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
311 310
312 // Check that a suitable temporary user profile has been created. 311 // Check that a suitable temporary user profile has been created.
313 UserProfileData user2Profile 312 UserProfileData user2Profile
314 = scene.CommsManager.UserService.GetUserProfile(user2FirstName, user2LastName); 313 = scene.CommsManager.UserService.GetUserProfile(
314 new UUID(Utils.MD5(Encoding.Unicode.GetBytes(user2FirstName + " " + user2LastName)), 0));
315 Assert.That(user2Profile, Is.Not.Null); 315 Assert.That(user2Profile, Is.Not.Null);
316 Assert.That(user2Profile.FirstName == user2FirstName); 316 Assert.That(user2Profile.FirstName == user2FirstName);
317 Assert.That(user2Profile.SurName == user2LastName); 317 Assert.That(user2Profile.SurName == user2LastName);
@@ -325,7 +325,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
325 325
326 Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod()); 326 Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod());
327 } 327 }
328 */
329 328
330 /// <summary> 329 /// <summary>
331 /// Test replication of an archive path to the user's inventory. 330 /// Test replication of an archive path to the user's inventory.
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index f7001ef..e04b1ba 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -54,10 +54,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
54{ 54{
55 public class FreeSwitchVoiceModule : IRegionModule 55 public class FreeSwitchVoiceModule : IRegionModule
56 { 56 {
57 57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
58 // Infrastructure
59 private static readonly ILog m_log =
60 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
61 58
62 private bool UseProxy = false; 59 private bool UseProxy = false;
63 60