diff options
| author | Melanie | 2013-06-06 03:20:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-06 03:20:15 +0100 |
| commit | fe4a67efb6f54cad3f00884712abe03704216421 (patch) | |
| tree | 04de93aaa8e9430c7c33e15912b3683b0297a10a /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Update HTTP server (diff) | |
| download | opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.zip opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.gz opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.bz2 opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 07bd48a..7628e23 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
| @@ -345,7 +345,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 345 | if (responsedata == null) | 345 | if (responsedata == null) |
| 346 | continue; | 346 | continue; |
| 347 | 347 | ||
| 348 | if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Normal) | 348 | if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Normal) // This is the event queue |
| 349 | { | 349 | { |
| 350 | try | 350 | try |
| 351 | { | 351 | { |