diff options
author | Melanie | 2011-07-23 11:39:32 +0100 |
---|---|---|
committer | Melanie | 2011-07-23 11:39:32 +0100 |
commit | 96174595da269f50d37c88c213ad00b79a7c7c83 (patch) | |
tree | 59655d3f8d0681ef77c1d939480edb2e3765e66d /OpenSim/Region/CoreModules/Avatar | |
parent | Fix merge artefact (diff) | |
download | opensim-SC-96174595da269f50d37c88c213ad00b79a7c7c83.zip opensim-SC-96174595da269f50d37c88c213ad00b79a7c7c83.tar.gz opensim-SC-96174595da269f50d37c88c213ad00b79a7c7c83.tar.bz2 opensim-SC-96174595da269f50d37c88c213ad00b79a7c7c83.tar.xz |
Fix LLTextBox to work with the updated libOMV
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 8a16582..f343f80 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |||
@@ -141,10 +141,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
141 | { | 141 | { |
142 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); | 142 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); |
143 | string ownerFirstName, ownerLastName; | 143 | string ownerFirstName, ownerLastName; |
144 | UUID ownerID = UUID.Zero; | ||
144 | if (account != null) | 145 | if (account != null) |
145 | { | 146 | { |
146 | ownerFirstName = account.FirstName; | 147 | ownerFirstName = account.FirstName; |
147 | ownerLastName = account.LastName; | 148 | ownerLastName = account.LastName; |
149 | ownerID = account.PrincipalID; | ||
148 | } | 150 | } |
149 | else | 151 | else |
150 | { | 152 | { |
@@ -155,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
155 | ScenePresence sp = m_scene.GetScenePresence(avatarid); | 157 | ScenePresence sp = m_scene.GetScenePresence(avatarid); |
156 | 158 | ||
157 | if (sp != null) | 159 | if (sp != null) |
158 | sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); | 160 | sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerID, ownerFirstName, ownerLastName, objectid); |
159 | } | 161 | } |
160 | 162 | ||
161 | public void SendNotificationToUsersInRegion( | 163 | public void SendNotificationToUsersInRegion( |