ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Caught HttpListenerException and swallowed if with output

Browse Source 
* Moved Flush into Close since it's always done in that order.
* Minor renamings
* Reversed if for clarity
This commit is contained in:
lbsa71
2008-02-25 15:36:24 +00:00
parent cda8b013ec
commit 5b3897a4af
6 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@@ -161,7 +161,6 @@ namespace OpenSim.Region.Environment.Modules
}
client.OnLogout += ClientLoggedOut;
client.OnConnectionClosed += ClientLoggedOut;
//client.OnDisconnectUser += ClientLoggedOut;
client.OnLogout += ClientLoggedOut;
}
catch (Exception ex)

26
OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
View File

@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules
/// texture sender for processing.
/// </summary>
/// <param name="textureID"></param>
/// <param name="asset"></param>
/// <param name="texture"></param>
public void TextureCallback(LLUUID textureID, AssetBase texture)
{
lock (m_textureSenders)
@@ -124,7 +124,17 @@ namespace OpenSim.Region.Environment.Modules
if (m_textureSenders.TryGetValue(textureID, out textureSender))
{
if (null != texture)
if (texture == null)
{
// Right now, leaving it up to lower level asset server code to post the fact that
// this texture could not be found
// TODO Send packet back to the client telling it not to expect the texture
//m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID);
m_scene.AddPendingDownloads(-1);
}
else
{
if (!textureSender.ImageLoaded)
{
@@ -132,17 +142,7 @@ namespace OpenSim.Region.Environment.Modules
EnqueueTextureSender(textureSender);
}
}
else
{
// Right now, leaving it up to lower level asset server code to post the fact that
// this texture could not be found
// TODO Send packet back to the client telling it not to expect the texture
//m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID);
m_scene.AddPendingDownloads(-1);
}
//m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID);
m_textureSenders.Remove(textureID);
//m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count);

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -1397,7 +1397,7 @@ namespace OpenSim.Region.Environment.Scenes
client.OnRegionInfoRequest += m_estateManager.HandleRegionInfoRequest;
client.OnEstateCovenantRequest += m_estateManager.HandleEstateCovenantRequest;
client.OnRequestGodlikePowers += handleRequestGodlikePowers;
client.OnGodKickUser += handleGodlikeKickUser;
client.OnGodKickUser += HandleGodlikeKickUser;
client.OnObjectPermissions += HandleObjectPermissionsUpdate;
client.OnCreateNewInventoryItem += CreateNewInventoryItem;
@@ -2188,7 +2188,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="agentID">the person that is being kicked</param>
/// <param name="kickflags">This isn't used apparently</param>
/// <param name="reason">The message to send to the user after it's been turned into a field</param>
public void handleGodlikeKickUser(LLUUID godID, LLUUID sessionID, LLUUID agentID, uint kickflags, byte[] reason)
public void HandleGodlikeKickUser(LLUUID godID, LLUUID sessionID, LLUUID agentID, uint kickflags, byte[] reason)
{
// For some reason the client sends this seemingly hard coded UUID for kicking everyone. Dun-know.
LLUUID kickUserID = new LLUUID("44e87126e7944ded05b37c42da3d5cdb");