diff options
| author | Tom Grimshaw | 2010-06-12 04:36:14 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-12 04:36:14 -0700 |
| commit | 63531b1df5463d43821c91a26bd0f6414716d0d0 (patch) | |
| tree | 381fddf86dbe4880b6e5114f3db8737fc9ecb53a /OpenSim/Region/OptionalModules | |
| parent | Get rid of spamming SOG debug message (diff) | |
| parent | Preserving the link numbers is a serializer's highest duty. (diff) | |
| download | opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.zip opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.gz opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.bz2 opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 2ed8fbf..d72ee6f 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1689,5 +1689,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1689 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | 1689 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) |
| 1690 | { | 1690 | { |
| 1691 | } | 1691 | } |
| 1692 | |||
| 1693 | public void StopFlying(ISceneEntity presence) | ||
| 1694 | { | ||
| 1695 | } | ||
| 1692 | } | 1696 | } |
| 1693 | } | 1697 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index e43ef78..c3edba2 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -1171,5 +1171,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 1171 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | 1171 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) |
| 1172 | { | 1172 | { |
| 1173 | } | 1173 | } |
| 1174 | |||
| 1175 | public void StopFlying(ISceneEntity presence) | ||
| 1176 | { | ||
| 1177 | } | ||
| 1174 | } | 1178 | } |
| 1175 | } | 1179 | } |