diff options
| author | Melanie | 2012-06-14 00:10:52 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-14 00:10:52 +0100 |
| commit | d893e54f4b4d3b4a8f6bfa3c8744487527a194a0 (patch) | |
| tree | 1601e04322dba9c6c4ae2412c92821f93aca5c7b /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplica... (diff) | |
| download | opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.zip opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.gz opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.bz2 opensim-SC-d893e54f4b4d3b4a8f6bfa3c8744487527a194a0.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index af76ea9..4b15325 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1430,8 +1430,6 @@ namespace OpenSim.Framework | |||
| 1430 | 1430 | ||
| 1431 | void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); | 1431 | void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); |
| 1432 | 1432 | ||
| 1433 | void KillEndDone(); | ||
| 1434 | |||
| 1435 | bool AddGenericPacketHandler(string MethodName, GenericMessage handler); | 1433 | bool AddGenericPacketHandler(string MethodName, GenericMessage handler); |
| 1436 | 1434 | ||
| 1437 | void SendRebakeAvatarTextures(UUID textureID); | 1435 | void SendRebakeAvatarTextures(UUID textureID); |