ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

* OMG! All but one references to UserProfileCacheService have been rerouted!

Browse Source 
* HG is seriously broken here
* Compiles. Untested.
This commit is contained in:
Diva Canto
2010-01-10 10:40:07 -08:00
parent 78e9dc7c2c
commit 1e1b2ab221
34 changed files with 795 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
View File

@@ -34,6 +34,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.Avatar.Dialog
{
@@ -116,12 +117,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
UUID avatarID, string objectName, UUID objectID, UUID ownerID,
string message, UUID textureID, int ch, string[] buttonlabels)
{
CachedUserInfo info = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerID);
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID);
string ownerFirstName, ownerLastName;
if (info != null)
if (account != null)
{
ownerFirstName = info.UserProfile.FirstName;
ownerLastName = info.UserProfile.SurName;
ownerFirstName = account.FirstName;
ownerLastName = account.LastName;
}
else
{