aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC
diff options
context:
space:
mode:
authorMelanie2011-07-23 18:34:46 +0200
committerMelanie2011-07-23 18:34:46 +0200
commit2e83b48873ae93776c257d6b829a14473a0a3a0d (patch)
treec0cfc4fe60fc840ba992cf9b59c9fe8239f72a48 /OpenSim/Region/OptionalModules/World/NPC
parentFix failure to find avatars due to trainling spaces being sent by viewers. (diff)
parentFix LLTextBox to work with the updated libOMV (diff)
downloadopensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.zip
opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.gz
opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.bz2
opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
1 files changed, 1 insertions, 1 deletions
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