aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2011-07-23 11:39:32 +0100
committerMelanie2011-07-23 11:39:32 +0100
commit96174595da269f50d37c88c213ad00b79a7c7c83 (patch)
tree59655d3f8d0681ef77c1d939480edb2e3765e66d /OpenSim/Region/OptionalModules
parentFix merge artefact (diff)
downloadopensim-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/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 4045507..26934e8 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1684,7 +1684,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1684 { 1684 {
1685 } 1685 }
1686 1686
1687 public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) 1687 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
1688 { 1688 {
1689 } 1689 }
1690 1690
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index f07ad67..69d6261 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -1162,7 +1162,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1162 { 1162 {
1163 } 1163 }
1164 1164
1165 public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) 1165 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
1166 { 1166 {
1167 } 1167 }
1168 1168