aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-31 19:25:01 +0100
committerJustin Clark-Casey (justincc)2011-05-31 19:25:01 +0100
commit8129e64e2acea6509d5c3a80425f6aa68baa037c (patch)
tree99f20a6caa70274060e43894f0e1143c20b66822 /OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
parentrevert the patch that accidentally got added in the last commit (diff)
downloadopensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.zip
opensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.tar.gz
opensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.tar.bz2
opensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.tar.xz
Fill in the new OwnerData field in the LLUDP ScriptDialog message.
If we don't do this then viewer 2.8 crashes. Resolves http://opensimulator.org/mantis/view.php?id=5510
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 8a977c9..0db31eb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -124,7 +124,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
124 124
125 ScenePresence sp = m_scene.GetScenePresence(avatarID); 125 ScenePresence sp = m_scene.GetScenePresence(avatarID);
126 if (sp != null) 126 if (sp != null)
127 sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); 127 sp.ControllingClient.SendDialog(
128 objectName, objectID, ownerID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
128 } 129 }
129 130
130 public void SendUrlToUser( 131 public void SendUrlToUser(