aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2012-11-20 01:21:15 +0000
committerMelanie2012-11-20 01:21:15 +0000
commitdecc5318a78cee5a8c18746363ab3b041d430289 (patch)
treee80b997dea1ac13d795ad9f22dfb02bc1a844b35 /OpenSim/Region/OptionalModules/World
parentMerge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminster (diff)
parentMerge branch 'teravuswork' into avination (diff)
downloadopensim-SC_OLD-decc5318a78cee5a8c18746363ab3b041d430289.zip
opensim-SC_OLD-decc5318a78cee5a8c18746363ab3b041d430289.tar.gz
opensim-SC_OLD-decc5318a78cee5a8c18746363ab3b041d430289.tar.bz2
opensim-SC_OLD-decc5318a78cee5a8c18746363ab3b041d430289.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 3a03101..d665126 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -597,6 +597,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
597 public virtual void SetChildAgentThrottle(byte[] throttle) 597 public virtual void SetChildAgentThrottle(byte[] throttle)
598 { 598 {
599 } 599 }
600
601 public void SetAgentThrottleSilent(int throttle, int setting)
602 {
603
604
605 }
600 public byte[] GetThrottlesPacked(float multiplier) 606 public byte[] GetThrottlesPacked(float multiplier)
601 { 607 {
602 return new byte[0]; 608 return new byte[0];