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

* added count of texture data bytes and asset bytes

ThreadPoolClientBranch
lbsa71 2008-02-09 21:50:45 +00:00
parent e2ed5bf6b9
commit 0b0bb28fd5
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -73,17 +73,22 @@ namespace OpenSim.Framework.Communications.Cache
TextureRequests.Count, TextureRequests.Count,
RequestedAssets.Count, RequestedAssets.Count,
RequestedTextures.Count, RequestedTextures.Count,
RequestLists.Count ); RequestLists.Count);
int temporaryImages = 0; int temporaryImages = 0;
int temporaryAssets = 0; int temporaryAssets = 0;
long imageBytes = 0;
long assetBytes = 0;
foreach (TextureImage texture in Textures.Values) foreach (TextureImage texture in Textures.Values)
{ {
if(texture.Temporary) if (texture.Temporary)
{ {
temporaryImages++; temporaryImages++;
} }
imageBytes += texture.Data.GetLongLength(0);
} }
foreach (AssetInfo asset in Assets.Values) foreach (AssetInfo asset in Assets.Values)
@ -92,11 +97,18 @@ namespace OpenSim.Framework.Communications.Cache
{ {
temporaryAssets++; temporaryAssets++;
} }
assetBytes += asset.Data.GetLongLength(0);
} }
m_log.InfoFormat("Temporary Images:{0} Temporary Assets:{1}", m_log.InfoFormat("Temporary Images: {0} Temporary Assets: {1}",
temporaryImages, temporaryImages,
temporaryAssets ); temporaryAssets);
m_log.InfoFormat("Image data: {0}kb Asset data: {1}kb",
imageBytes/1024,
assetBytes/1024);
} }
public void Clear() public void Clear()
@ -126,7 +138,7 @@ namespace OpenSim.Framework.Communications.Cache
m_assetServer = assetServer; m_assetServer = assetServer;
m_assetServer.SetReceiver(this); m_assetServer.SetReceiver(this);
m_assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); m_assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
m_assetCacheThread.IsBackground = true; m_assetCacheThread.IsBackground = true;
m_assetCacheThread.Start(); m_assetCacheThread.Start();

6
OpenSim/Region/Environment/PermissionManager.cs
View File

@ -494,7 +494,9 @@ namespace OpenSim.Region.Environment
bool permission = false; bool permission = false;
if (parcel.landData.ownerID == user) if (parcel.landData.ownerID == user)
{
permission = true; permission = true;
}
if (parcel.landData.isGroupOwned) if (parcel.landData.isGroupOwned)
{ {
@ -502,10 +504,14 @@ namespace OpenSim.Region.Environment
} }
if (IsEstateManager(user)) if (IsEstateManager(user))
{
permission = true; permission = true;
}
if (IsAdministrator(user)) if (IsAdministrator(user))
{
permission = true; permission = true;
}
return permission; return permission;
} }