diff options
| author | Melanie | 2010-06-12 01:26:55 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-12 01:26:55 +0100 |
| commit | 508bfa1de81d6de0c75109451558271140d79d50 (patch) | |
| tree | 199f6924ace32b7060008a3776b762fedfce49cf /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet (diff) | |
| download | opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.zip opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.gz opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.bz2 opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -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 71174d2..d85b101 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1310,5 +1310,7 @@ namespace OpenSim.Framework | |||
| 1310 | 1310 | ||
| 1311 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); | 1311 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); |
| 1312 | void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId); | 1312 | void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId); |
| 1313 | |||
| 1314 | void StopFlying(ISceneEntity presence); | ||
| 1313 | } | 1315 | } |
| 1314 | } | 1316 | } |