aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorlbsa712009-03-31 05:51:28 +0000
committerlbsa712009-03-31 05:51:28 +0000
commitfb9a358b797418fbc4c38dd9ec67e12bb5b7c98a (patch)
tree76d79c2b83945f40026e0dbb7558e909da173a43 /OpenSim/Framework/Communications
parentThanks rtomita for a patch to add a handler for the RemoveInventoryObjects pa... (diff)
downloadopensim-SC_OLD-fb9a358b797418fbc4c38dd9ec67e12bb5b7c98a.zip
opensim-SC_OLD-fb9a358b797418fbc4c38dd9ec67e12bb5b7c98a.tar.gz
opensim-SC_OLD-fb9a358b797418fbc4c38dd9ec67e12bb5b7c98a.tar.bz2
opensim-SC_OLD-fb9a358b797418fbc4c38dd9ec67e12bb5b7c98a.tar.xz
* Refactored out and de-duplicated Base64ToString(string)
* Fixed minor typo
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 73aa6ba..e0d0bd7 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -34,6 +34,7 @@ using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Packets; 35using OpenMetaverse.Packets;
36using OpenSim.Framework.Statistics; 36using OpenSim.Framework.Statistics;
37using System.Text;
37 38
38namespace OpenSim.Framework.Communications.Cache 39namespace OpenSim.Framework.Communications.Cache
39{ 40{
@@ -334,7 +335,7 @@ namespace OpenSim.Framework.Communications.Cache
334 { 335 {
335 AssetInfo assetInf = new AssetInfo(asset); 336 AssetInfo assetInf = new AssetInfo(asset);
336 337
337 ProcessRecievedAsset(IsTexture, assetInf); 338 ProcessReceivedAsset(IsTexture, assetInf);
338 339
339 if (!m_memcache.Contains(assetInf.FullID)) 340 if (!m_memcache.Contains(assetInf.FullID))
340 { 341 {
@@ -389,8 +390,8 @@ namespace OpenSim.Framework.Communications.Cache
389 } 390 }
390 } 391 }
391 392
392 protected void ProcessRecievedAsset(bool IsTexture, AssetInfo assetInf) 393 protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf)
393 { 394 {
394 } 395 }
395 396
396 // See IAssetReceiver 397 // See IAssetReceiver