aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-04-01 23:59:00 +0100
committerJustin Clark-Casey (justincc)2010-04-01 23:59:00 +0100
commite0eba26f7bd2258ec026a42e278420fa0938cea7 (patch)
tree39ae2410374c07ff62a52af3551888746ed36c3c /OpenSim/Region/OptionalModules/World
parentoops, add file missing from last commit (diff)
parentFirst attempt at fixing mantis #4641. It's better but there are now some issu... (diff)
downloadopensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.zip
opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.gz
opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.bz2
opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-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 77958eb..338c04b 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -550,7 +550,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
550 550
551 } 551 }
552 552
553 public void SendGenericMessage(string method, List<string> message) 553 public void SendGenericMessage(string method, List<byte[]> message)
554 { 554 {
555 555
556 } 556 }