diff options
| author | Melanie | 2011-06-20 03:08:56 +0200 |
|---|---|---|
| committer | Melanie | 2011-06-20 03:08:56 +0200 |
| commit | f4f55c4d6bdbe9a86b5343159916977b331fefe0 (patch) | |
| tree | 08fb85f2aa0193bf8549e684b98501c2c52faa1a /OpenSim/Region/OptionalModules/World | |
| parent | Add some flags to control content in search better (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-f4f55c4d6bdbe9a86b5343159916977b331fefe0.zip opensim-SC-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.gz opensim-SC-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.bz2 opensim-SC-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://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.cs | 2 |
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 d895438..f07ad67 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -631,7 +631,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 631 | { | 631 | { |
| 632 | } | 632 | } |
| 633 | 633 | ||
| 634 | public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) | 634 | public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) |
| 635 | { | 635 | { |
| 636 | } | 636 | } |
| 637 | 637 | ||