OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

give viewers more time to start uploading assets

master
UbitUmarov 2020-04-30 17:02:37 +01:00
parent 22c28a0260
commit 5fa81a6ca9
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Caps.cs
View File

@ -174,9 +174,9 @@ namespace OpenSim.Framework.Capabilities
public void Dispose(bool disposing) public void Dispose(bool disposing)
{ {
Flags = CapsFlags.None; Flags = CapsFlags.None;
DeregisterHandlers();
if (m_capsActive != null) if (m_capsActive != null)
{ {
DeregisterHandlers();
m_capsActive.Dispose(); m_capsActive.Dispose();
m_capsActive = null; m_capsActive = null;
} }

6
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/UpdateItemAsset.cs
View File

@ -284,7 +284,8 @@ namespace OpenSim.Region.ClientStack.Linden
m_timeout = new Timer(); m_timeout = new Timer();
m_timeout.Elapsed += Timeout; m_timeout.Elapsed += Timeout;
m_timeout.Interval = 1000; m_timeout.AutoReset = false;
m_timeout.Interval = 30000;
m_timeout.Start(); m_timeout.Start();
} }
@ -386,7 +387,8 @@ namespace OpenSim.Region.ClientStack.Linden
m_remoteAddress = address; m_remoteAddress = address;
m_timeout = new Timer(); m_timeout = new Timer();
m_timeout.Elapsed += Timeout; m_timeout.Elapsed += Timeout;
m_timeout.Interval = 1000; m_timeout.AutoReset = false;
m_timeout.Interval = 30000;
m_timeout.Start(); m_timeout.Start();
} }

3
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
View File

@ -171,7 +171,8 @@ namespace OpenSim.Region.ClientStack.Linden
m_assetCache = cache; m_assetCache = cache;
m_timeout = new Timer(); m_timeout = new Timer();
m_timeout.Elapsed += Timeout; m_timeout.Elapsed += Timeout;
m_timeout.Interval = 1000; m_timeout.AutoReset = false;
m_timeout.Interval = 30000;
m_timeout.Start(); m_timeout.Start();
} }