diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index b3bdff3..cdce36e 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
| @@ -540,7 +540,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 540 | { | 540 | { |
| 541 | } | 541 | } |
| 542 | 542 | ||
| 543 | public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) | 543 | public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) |
| 544 | { | 544 | { |
| 545 | } | 545 | } |
| 546 | 546 | ||