aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC
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/World/NPC
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMove "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet (diff)
downloadopensim-SC-508bfa1de81d6de0c75109451558271140d79d50.zip
opensim-SC-508bfa1de81d6de0c75109451558271140d79d50.tar.gz
opensim-SC-508bfa1de81d6de0c75109451558271140d79d50.tar.bz2
opensim-SC-508bfa1de81d6de0c75109451558271140d79d50.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs4
1 files changed, 4 insertions, 0 deletions
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}