diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index d3324e4..0f58788 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
29 | using System.Globalization; | 30 | using System.Globalization; |
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using log4net; | 32 | using log4net; |
@@ -41,6 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
41 | { | 42 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | private Scene m_scene; | 44 | private Scene m_scene; |
45 | private IProfileModule m_profileModule = null; | ||
44 | 46 | ||
45 | public AvatarProfilesModule() | 47 | public AvatarProfilesModule() |
46 | { | 48 | { |
@@ -56,6 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
56 | 58 | ||
57 | public void PostInitialise() | 59 | public void PostInitialise() |
58 | { | 60 | { |
61 | m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); | ||
59 | } | 62 | } |
60 | 63 | ||
61 | public void Close() | 64 | public void Close() |
@@ -108,6 +111,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
108 | charterMember = Utils.StringToBytes(profile.CustomType); | 111 | charterMember = Utils.StringToBytes(profile.CustomType); |
109 | } | 112 | } |
110 | 113 | ||
114 | if (m_profileModule != null) | ||
115 | { | ||
116 | Hashtable profileData = m_profileModule.GetProfileData(remoteClient.AgentId); | ||
117 | if (profileData["ProfileUrl"] != null) | ||
118 | profile.ProfileUrl = profileData["ProfileUrl"].ToString(); | ||
119 | } | ||
111 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, | 120 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, |
112 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), | 121 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), |
113 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), | 122 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), |