ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:27:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Diva Canto
2009-08-13 06:31:24 -07:00
parent b0292d59a5 3669115d60
commit 6a0f7c2275
6 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
View File

@@ -26,6 +26,7 @@
*/
using System;
using System.Collections;
using System.Globalization;
using System.Reflection;
using log4net;
@@ -41,6 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene;
private IProfileModule m_profileModule = null;
public AvatarProfilesModule()
{
@@ -56,6 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
public void PostInitialise()
{
m_profileModule = m_scene.RequestModuleInterface<IProfileModule>();
}
public void Close()
@@ -108,6 +111,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
charterMember = Utils.StringToBytes(profile.CustomType);
}
if (m_profileModule != null)
{
Hashtable profileData = m_profileModule.GetProfileData(remoteClient.AgentId);
if (profileData["ProfileUrl"] != null)
profile.ProfileUrl = profileData["ProfileUrl"].ToString();
}
remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture),
charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),