aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMike Rieker2010-05-27 21:31:10 -0400
committerMike Rieker2010-05-27 21:31:10 -0400
commit9ea42fdfab2ac99e24b386d67a08cf0024230f54 (patch)
treefdefa445346d03ad2d73b62687ffae4e3b635ba9 /OpenSim/Region/OptionalModules/World
parentfix hanging output throttle arithmetic (diff)
parentPrevent a null ref (diff)
downloadopensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.zip
opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.gz
opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.bz2
opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.xz
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 9f6a33a..e43ef78 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -551,6 +551,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
551 551
552 } 552 }
553 553
554 public void SendGenericMessage(string method, List<string> message)
555 {
556
557 }
558
554 public void SendGenericMessage(string method, List<byte[]> message) 559 public void SendGenericMessage(string method, List<byte[]> message)
555 { 560 {
556 561