aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-07 18:54:11 +0000
committerJustin Clarke Casey2008-07-07 18:54:11 +0000
commit0b2fcbfec4ae06b3e3f278d9e42f84c88f556587 (patch)
tree0a62ef6c55651582adba93b7bd003384f4f9db03 /OpenSim/Framework
parent* switch terrain archiving to raw32 rather than png to avoid unnecessary post... (diff)
downloadopensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.zip
opensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.tar.gz
opensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.tar.bz2
opensim-SC_OLD-0b2fcbfec4ae06b3e3f278d9e42f84c88f556587.tar.xz
* Start scripts loaded from an archive
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index f160ce4..7099760 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -348,7 +348,7 @@ namespace OpenSim.Framework.Communications.Cache
348 /// <param name="asset"></param> 348 /// <param name="asset"></param>
349 public void AddAsset(AssetBase asset) 349 public void AddAsset(AssetBase asset)
350 { 350 {
351 if (asset.Type == 0) 351 if (asset.Type == (int)AssetType.Texture)
352 { 352 {
353 if (!Textures.ContainsKey(asset.FullID)) 353 if (!Textures.ContainsKey(asset.FullID))
354 { 354 {
@@ -365,9 +365,9 @@ namespace OpenSim.Framework.Communications.Cache
365 } 365 }
366 } 366 }
367 else 367 else
368 { 368 {
369 if (!Assets.ContainsKey(asset.FullID)) 369 if (!Assets.ContainsKey(asset.FullID))
370 { 370 {
371 AssetInfo assetInf = new AssetInfo(asset); 371 AssetInfo assetInf = new AssetInfo(asset);
372 Assets.Add(assetInf.FullID, assetInf); 372 Assets.Add(assetInf.FullID, assetInf);
373 373