diff options
author | Homer Horwitz | 2009-05-16 16:01:25 +0000 |
---|---|---|
committer | Homer Horwitz | 2009-05-16 16:01:25 +0000 |
commit | 99cf8e3f5ab73c6d25506678d78f847278865630 (patch) | |
tree | f8104a56f2579c385d2f390ad172cc904ca2608e /OpenSim/Region/CoreModules/Avatar/Dialog | |
parent | Oops. Next time try not to commit things at the same time as having important... (diff) | |
download | opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.zip opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.tar.gz opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.tar.bz2 opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.tar.xz |
Send the owner name, not the client name on SendDialog.
This modifies IClientAPI.SendDialog slightly.
Fixes Mantis #3661.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Dialog')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 6dd020a..90c335c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |||
@@ -31,6 +31,7 @@ using log4net; | |||
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications.Cache; | ||
34 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
36 | 37 | ||
@@ -106,16 +107,28 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
106 | presence.ControllingClient.SendAlertMessage(message); | 107 | presence.ControllingClient.SendAlertMessage(message); |
107 | } | 108 | } |
108 | } | 109 | } |
109 | 110 | ||
110 | public void SendDialogToUser( | 111 | public void SendDialogToUser( |
111 | UUID avatarID, string objectName, UUID objectID, UUID ownerID, | 112 | UUID avatarID, string objectName, UUID objectID, UUID ownerID, |
112 | string message, UUID textureID, int ch, string[] buttonlabels) | 113 | string message, UUID textureID, int ch, string[] buttonlabels) |
113 | { | 114 | { |
115 | CachedUserInfo info = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerID); | ||
116 | string ownerFirstName, ownerLastName; | ||
117 | if (info != null) | ||
118 | { | ||
119 | ownerFirstName = info.UserProfile.FirstName; | ||
120 | ownerLastName = info.UserProfile.SurName; | ||
121 | } | ||
122 | else | ||
123 | { | ||
124 | ownerFirstName = "(unknown"; | ||
125 | ownerLastName = "user)"; | ||
126 | } | ||
127 | |||
114 | ScenePresence sp = m_scene.GetScenePresence(avatarID); | 128 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
115 | |||
116 | if (sp != null) | 129 | if (sp != null) |
117 | sp.ControllingClient.SendDialog(objectName, objectID, ownerID, message, textureID, ch, buttonlabels); | 130 | sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); |
118 | } | 131 | } |
119 | 132 | ||
120 | public void SendUrlToUser( | 133 | public void SendUrlToUser( |
121 | UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) | 134 | UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) |