diff options
| author | Melanie | 2010-05-23 06:09:54 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-23 06:09:54 +0100 |
| commit | a9dad994324122555c436a5db14ff4072fbf6c89 (patch) | |
| tree | 3b5dfbb8f6d989cff561fd304c822e7cbfc7c61a /OpenSim/Region/Examples | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Apply http://opensimulator.org/mantis/view.php?id=4632 (diff) | |
| download | opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.zip opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.gz opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.bz2 opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Examples')
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 4bbe9df..a84a3c8 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
| @@ -461,6 +461,10 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 461 | 461 | ||
| 462 | } | 462 | } |
| 463 | 463 | ||
| 464 | public void SendGenericMessage(string method, List<string> message) | ||
| 465 | { | ||
| 466 | } | ||
| 467 | |||
| 464 | public void SendGenericMessage(string method, List<byte[]> message) | 468 | public void SendGenericMessage(string method, List<byte[]> message) |
| 465 | { | 469 | { |
| 466 | 470 | ||