aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2012-11-20 00:48:13 +0100
committerMelanie2012-11-20 00:48:13 +0100
commit0bf66434bc87694c7a19b899afd9b068c67f3bec (patch)
tree5c373252d92103dbd7c8376ef8ebd5e7ff8cecc9 /OpenSim/Region/OptionalModules
parentPrevent a buffer overflow in asset receiving (diff)
parent* Plumbing and basic setting of the GetMesh Cap Throttler. (diff)
downloadopensim-SC_OLD-0bf66434bc87694c7a19b899afd9b068c67f3bec.zip
opensim-SC_OLD-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.gz
opensim-SC_OLD-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.bz2
opensim-SC_OLD-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.xz
Merge branch 'teravuswork' into avination
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs5
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs6
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 28b8293..563fd12 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1428,6 +1428,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1428 1428
1429 } 1429 }
1430 1430
1431 public void SetAgentThrottleSilent(int throttle, int setting)
1432 {
1433
1434
1435 }
1431 public byte[] GetThrottlesPacked(float multiplier) 1436 public byte[] GetThrottlesPacked(float multiplier)
1432 { 1437 {
1433 return new byte[0]; 1438 return new byte[0];
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 6c8e2fc..ef53c48 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];