aboutsummaryrefslogtreecommitdiffstatshomepage
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
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
-rw-r--r--OpenSim/Framework/Communications/OspResolver.cs12
-rw-r--r--OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs8
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs7
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs5
4 files changed, 20 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/OspResolver.cs b/OpenSim/Framework/Communications/OspResolver.cs
index f246692..4627e30 100644
--- a/OpenSim/Framework/Communications/OspResolver.cs
+++ b/OpenSim/Framework/Communications/OspResolver.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Communications
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 public const string OSPA_PREFIX = "ospi:"; 45 public const string OSPA_PREFIX = "ospa:";
46 public const string OSPA_NAME_KEY = "n"; 46 public const string OSPA_NAME_KEY = "n";
47 public const string OSPA_NAME_VALUE_SEPARATOR = " "; 47 public const string OSPA_NAME_VALUE_SEPARATOR = " ";
48 public const string OSPA_TUPLE_SEPARATOR = "|"; 48 public const string OSPA_TUPLE_SEPARATOR = "|";
@@ -76,6 +76,8 @@ namespace OpenSim.Framework.Communications
76 /// </returns> 76 /// </returns>
77 public static string Resolve(string ospa, CommunicationsManager commsManager) 77 public static string Resolve(string ospa, CommunicationsManager commsManager)
78 { 78 {
79 m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
80
79 if (!ospa.StartsWith(OSPA_PREFIX)) 81 if (!ospa.StartsWith(OSPA_PREFIX))
80 return ospa; 82 return ospa;
81 83
@@ -88,7 +90,7 @@ namespace OpenSim.Framework.Communications
88 90
89 if (tupleSeparatorIndex < 0) 91 if (tupleSeparatorIndex < 0)
90 { 92 {
91 m_log.WarnFormat("[OSPA RESOLVER]: Ignoring non-tuple component {0} in OSPA {1}", tuple, ospa); 93 m_log.WarnFormat("[OSP RESOLVER]: Ignoring non-tuple component {0} in OSPA {1}", tuple, ospa);
92 continue; 94 continue;
93 } 95 }
94 96
@@ -117,7 +119,7 @@ namespace OpenSim.Framework.Communications
117 119
118 if (nameSeparatorIndex < 0) 120 if (nameSeparatorIndex < 0)
119 { 121 {
120 m_log.WarnFormat("[OSPA RESOLVER]: Ignoring unseparated name {0}", name); 122 m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name);
121 return null; 123 return null;
122 } 124 }
123 125
@@ -127,12 +129,14 @@ namespace OpenSim.Framework.Communications
127 CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); 129 CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
128 if (userInfo != null) 130 if (userInfo != null)
129 return userInfo.UserProfile.ID.ToString(); 131 return userInfo.UserProfile.ID.ToString();
130 132
131 UserProfileData tempUserProfile = new UserProfileData(); 133 UserProfileData tempUserProfile = new UserProfileData();
132 tempUserProfile.FirstName = firstName; 134 tempUserProfile.FirstName = firstName;
133 tempUserProfile.SurName = lastName; 135 tempUserProfile.SurName = lastName;
134 tempUserProfile.ID = new UUID(Utils.MD5(Encoding.Unicode.GetBytes(tempUserProfile.Name)), 0); 136 tempUserProfile.ID = new UUID(Utils.MD5(Encoding.Unicode.GetBytes(tempUserProfile.Name)), 0);
135 137
138 m_log.DebugFormat(
139 "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);
136 commsManager.UserService.AddTemporaryUserProfile(tempUserProfile); 140 commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
137 141
138 return tempUserProfile.ID.ToString(); 142 return tempUserProfile.ID.ToString();
diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
index 3b78c99..7478cdd 100644
--- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
+++ b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs
@@ -27,6 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using log4net;
30using OpenMetaverse; 32using OpenMetaverse;
31using OpenSim.Data; 33using OpenSim.Data;
32 34
@@ -37,6 +39,8 @@ namespace OpenSim.Framework.Communications
37 /// </summary> 39 /// </summary>
38 public class TemporaryUserProfilePlugin : IUserDataPlugin 40 public class TemporaryUserProfilePlugin : IUserDataPlugin
39 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
40 protected Dictionary<UUID, UserProfileData> m_profiles = new Dictionary<UUID, UserProfileData>(); 44 protected Dictionary<UUID, UserProfileData> m_profiles = new Dictionary<UUID, UserProfileData>();
41 45
42 public string Name { get { return "TemporaryUserProfilePlugin"; } } 46 public string Name { get { return "TemporaryUserProfilePlugin"; } }
@@ -47,6 +51,8 @@ namespace OpenSim.Framework.Communications
47 51
48 public UserProfileData GetUserByUUID(UUID user) 52 public UserProfileData GetUserByUUID(UUID user)
49 { 53 {
54 m_log.DebugFormat("[TEMP USER PROFILE]: Received request for {0}", user);
55
50 lock (m_profiles) 56 lock (m_profiles)
51 { 57 {
52 if (m_profiles.ContainsKey(user)) 58 if (m_profiles.ContainsKey(user))
@@ -66,6 +72,8 @@ namespace OpenSim.Framework.Communications
66 72
67 public virtual void AddTemporaryUserProfile(UserProfileData userProfile) 73 public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
68 { 74 {
75 m_log.DebugFormat("[TEMP USER PROFILE]: Adding {0} {1}", userProfile.Name, userProfile.ID);
76
69 lock (m_profiles) 77 lock (m_profiles)
70 { 78 {
71 m_profiles[userProfile.ID] = userProfile; 79 m_profiles[userProfile.ID] = userProfile;
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