aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2010-04-02 14:53:52 +0100
committerMelanie2010-04-02 14:53:52 +0100
commita004d88bf3d7f753d8660009c019e252f6cf627b (patch)
tree874a0133087b5300fa32528d7943e50252640c09 /OpenSim/Region/OptionalModules/World
parentAdding the groups update (Mantis #4646) (diff)
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a004d88bf3d7f753d8660009c019e252f6cf627b.zip
opensim-SC_OLD-a004d88bf3d7f753d8660009c019e252f6cf627b.tar.gz
opensim-SC_OLD-a004d88bf3d7f753d8660009c019e252f6cf627b.tar.bz2
opensim-SC_OLD-a004d88bf3d7f753d8660009c019e252f6cf627b.tar.xz
Merge branch 'master' of melanie@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 }