diff options
author | ubit | 2012-09-26 04:06:46 +0200 |
---|---|---|
committer | ubit | 2012-09-26 04:06:46 +0200 |
commit | 83469547981954b5b54456a94c2df6a7c2a113cf (patch) | |
tree | 245a044bbcb6862da62e5a5686eb7f41cbf9b3be /OpenSim/Region/ClientStack/Linden | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | more changes to PollService (diff) | |
download | opensim-SC-83469547981954b5b54456a94c2df6a7c2a113cf.zip opensim-SC-83469547981954b5b54456a94c2df6a7c2a113cf.tar.gz opensim-SC-83469547981954b5b54456a94c2df6a7c2a113cf.tar.bz2 opensim-SC-83469547981954b5b54456a94c2df6a7c2a113cf.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index b16076d..8a607fb 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -160,7 +160,11 @@ namespace OpenSim.Region.ClientStack.Linden | |||
160 | { | 160 | { |
161 | m_scene = scene; | 161 | m_scene = scene; |
162 | 162 | ||
163 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; | 163 | HasEvents = (x, y) => |
164 | { | ||
165 | lock (responses) | ||
166 | return responses.ContainsKey(x); | ||
167 | }; | ||
164 | GetEvents = (x, y, s) => | 168 | GetEvents = (x, y, s) => |
165 | { | 169 | { |
166 | lock (responses) | 170 | lock (responses) |
@@ -247,6 +251,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
247 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); | 251 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); |
248 | 252 | ||
249 | args.Type = PollServiceEventArgs.EventType.Texture; | 253 | args.Type = PollServiceEventArgs.EventType.Texture; |
254 | args.GetEventsNeedsRequest = false; | ||
250 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | 255 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
251 | 256 | ||
252 | string hostName = m_scene.RegionInfo.ExternalHostName; | 257 | string hostName = m_scene.RegionInfo.ExternalHostName; |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 0f305b1..56070c6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -223,6 +223,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
223 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(agentID); | 223 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(agentID); |
224 | 224 | ||
225 | args.Type = PollServiceEventArgs.EventType.Inventory; | 225 | args.Type = PollServiceEventArgs.EventType.Inventory; |
226 | args.GetEventsNeedsRequest = false; | ||
226 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | 227 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
227 | 228 | ||
228 | string hostName = m_scene.RegionInfo.ExternalHostName; | 229 | string hostName = m_scene.RegionInfo.ExternalHostName; |