diff options
| author | Melanie | 2013-07-24 04:45:07 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-24 04:45:07 +0100 |
| commit | e82d4154a2e348e4a38f01cb1877878c94569bba (patch) | |
| tree | 7b27e6d30d04f6089fd17d5779cfb0a81e50d508 /OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff) | |
| download | opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.zip opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.gz opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.bz2 opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs index 073c357..41dd4d1 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | |||
| @@ -206,6 +206,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 206 | } | 206 | } |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | public bool HasUpdates() | ||
| 210 | { | ||
| 211 | J2KImage image = GetHighestPriorityImage(); | ||
| 212 | |||
| 213 | return image != null && image.IsDecoded; | ||
| 214 | } | ||
| 215 | |||
| 209 | public bool ProcessImageQueue(int packetsToSend) | 216 | public bool ProcessImageQueue(int packetsToSend) |
| 210 | { | 217 | { |
| 211 | int packetsSent = 0; | 218 | int packetsSent = 0; |