diff options
| author | Melanie | 2012-11-20 01:21:15 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-20 01:21:15 +0000 |
| commit | decc5318a78cee5a8c18746363ab3b041d430289 (patch) | |
| tree | e80b997dea1ac13d795ad9f22dfb02bc1a844b35 /OpenSim/Framework | |
| parent | Merge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminster (diff) | |
| parent | Merge branch 'teravuswork' into avination (diff) | |
| download | opensim-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/Framework')
| -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 1c6685a..f686c60 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1175,6 +1175,8 @@ namespace OpenSim.Framework | |||
| 1175 | 1175 | ||
| 1176 | void SetChildAgentThrottle(byte[] throttle); | 1176 | void SetChildAgentThrottle(byte[] throttle); |
| 1177 | 1177 | ||
| 1178 | void SetAgentThrottleSilent(int throttle, int setting); | ||
| 1179 | |||
| 1178 | void SendAvatarDataImmediate(ISceneEntity avatar); | 1180 | void SendAvatarDataImmediate(ISceneEntity avatar); |
| 1179 | 1181 | ||
| 1180 | /// <summary> | 1182 | /// <summary> |