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/Region/OptionalModules/Agent | |
| 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/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 5 |
1 files changed, 5 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]; |