diff options
author | Melanie | 2012-11-20 00:48:13 +0100 |
---|---|---|
committer | Melanie | 2012-11-20 00:48:13 +0100 |
commit | 0bf66434bc87694c7a19b899afd9b068c67f3bec (patch) | |
tree | 5c373252d92103dbd7c8376ef8ebd5e7ff8cecc9 /OpenSim/Tests | |
parent | Prevent a buffer overflow in asset receiving (diff) | |
parent | * Plumbing and basic setting of the GetMesh Cap Throttler. (diff) | |
download | opensim-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/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 78bb18e..d1af0fc 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -521,6 +521,12 @@ namespace OpenSim.Tests.Common.Mock | |||
521 | public virtual void SetChildAgentThrottle(byte[] throttle) | 521 | public virtual void SetChildAgentThrottle(byte[] throttle) |
522 | { | 522 | { |
523 | } | 523 | } |
524 | |||
525 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
526 | { | ||
527 | |||
528 | |||
529 | } | ||
524 | public byte[] GetThrottlesPacked(float multiplier) | 530 | public byte[] GetThrottlesPacked(float multiplier) |
525 | { | 531 | { |
526 | return new byte[0]; | 532 | return new byte[0]; |