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/Framework/IClientAPI.cs | |
| parent | Prevent a buffer overflow in asset receiving (diff) | |
| parent | * Plumbing and basic setting of the GetMesh Cap Throttler. (diff) | |
| download | opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.zip opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.gz opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.bz2 opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.xz | |
Merge branch 'teravuswork' into avination
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index e31c7f6..6559638 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1135,6 +1135,8 @@ namespace OpenSim.Framework | |||
| 1135 | 1135 | ||
| 1136 | void SetChildAgentThrottle(byte[] throttle); | 1136 | void SetChildAgentThrottle(byte[] throttle); |
| 1137 | 1137 | ||
| 1138 | void SetAgentThrottleSilent(int throttle, int setting); | ||
| 1139 | |||
| 1138 | void SendAvatarDataImmediate(ISceneEntity avatar); | 1140 | void SendAvatarDataImmediate(ISceneEntity avatar); |
| 1139 | 1141 | ||
| 1140 | /// <summary> | 1142 | /// <summary> |