diff options
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 24 | ||||
-rw-r--r-- | OpenSim/Region/Environment/PermissionManager.cs | 6 |
2 files changed, 24 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 9435c3d..3e60ceb 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -73,17 +73,22 @@ namespace OpenSim.Framework.Communications.Cache | |||
73 | TextureRequests.Count, | 73 | TextureRequests.Count, |
74 | RequestedAssets.Count, | 74 | RequestedAssets.Count, |
75 | RequestedTextures.Count, | 75 | RequestedTextures.Count, |
76 | RequestLists.Count ); | 76 | RequestLists.Count); |
77 | 77 | ||
78 | int temporaryImages = 0; | 78 | int temporaryImages = 0; |
79 | int temporaryAssets = 0; | 79 | int temporaryAssets = 0; |
80 | 80 | ||
81 | long imageBytes = 0; | ||
82 | long assetBytes = 0; | ||
83 | |||
81 | foreach (TextureImage texture in Textures.Values) | 84 | foreach (TextureImage texture in Textures.Values) |
82 | { | 85 | { |
83 | if(texture.Temporary) | 86 | if (texture.Temporary) |
84 | { | 87 | { |
85 | temporaryImages++; | 88 | temporaryImages++; |
86 | } | 89 | } |
90 | |||
91 | imageBytes += texture.Data.GetLongLength(0); | ||
87 | } | 92 | } |
88 | 93 | ||
89 | foreach (AssetInfo asset in Assets.Values) | 94 | foreach (AssetInfo asset in Assets.Values) |
@@ -92,11 +97,18 @@ namespace OpenSim.Framework.Communications.Cache | |||
92 | { | 97 | { |
93 | temporaryAssets++; | 98 | temporaryAssets++; |
94 | } | 99 | } |
100 | |||
101 | assetBytes += asset.Data.GetLongLength(0); | ||
95 | } | 102 | } |
96 | 103 | ||
97 | m_log.InfoFormat("Temporary Images:{0} Temporary Assets:{1}", | 104 | m_log.InfoFormat("Temporary Images: {0} Temporary Assets: {1}", |
98 | temporaryImages, | 105 | temporaryImages, |
99 | temporaryAssets ); | 106 | temporaryAssets); |
107 | |||
108 | m_log.InfoFormat("Image data: {0}kb Asset data: {1}kb", | ||
109 | imageBytes/1024, | ||
110 | assetBytes/1024); | ||
111 | |||
100 | } | 112 | } |
101 | 113 | ||
102 | public void Clear() | 114 | public void Clear() |
@@ -126,7 +138,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
126 | m_assetServer = assetServer; | 138 | m_assetServer = assetServer; |
127 | m_assetServer.SetReceiver(this); | 139 | m_assetServer.SetReceiver(this); |
128 | 140 | ||
129 | 141 | ||
130 | m_assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); | 142 | m_assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); |
131 | m_assetCacheThread.IsBackground = true; | 143 | m_assetCacheThread.IsBackground = true; |
132 | m_assetCacheThread.Start(); | 144 | m_assetCacheThread.Start(); |
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index 6c49586..7cf89b0 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs | |||
@@ -494,7 +494,9 @@ namespace OpenSim.Region.Environment | |||
494 | bool permission = false; | 494 | bool permission = false; |
495 | 495 | ||
496 | if (parcel.landData.ownerID == user) | 496 | if (parcel.landData.ownerID == user) |
497 | { | ||
497 | permission = true; | 498 | permission = true; |
499 | } | ||
498 | 500 | ||
499 | if (parcel.landData.isGroupOwned) | 501 | if (parcel.landData.isGroupOwned) |
500 | { | 502 | { |
@@ -502,10 +504,14 @@ namespace OpenSim.Region.Environment | |||
502 | } | 504 | } |
503 | 505 | ||
504 | if (IsEstateManager(user)) | 506 | if (IsEstateManager(user)) |
507 | { | ||
505 | permission = true; | 508 | permission = true; |
509 | } | ||
506 | 510 | ||
507 | if (IsAdministrator(user)) | 511 | if (IsAdministrator(user)) |
512 | { | ||
508 | permission = true; | 513 | permission = true; |
514 | } | ||
509 | 515 | ||
510 | return permission; | 516 | return permission; |
511 | } | 517 | } |