aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2010-06-12 01:26:55 +0100
committerMelanie2010-06-12 01:26:55 +0100
commit508bfa1de81d6de0c75109451558271140d79d50 (patch)
tree199f6924ace32b7060008a3776b762fedfce49cf /OpenSim/Region/OptionalModules
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMove "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet (diff)
downloadopensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.zip
opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.gz
opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.bz2
opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs4
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}