aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
diff options
context:
space:
mode:
authorDiva Canto2011-05-02 08:48:55 -0700
committerDiva Canto2011-05-02 08:48:55 -0700
commit10180760b741edf22cec23db0ec490669407425f (patch)
tree66f52dc38657213e03470aab161a0d2ffa3fffe6 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
parentStart to drill down on GetTexture. Read the config and do different things. (diff)
downloadopensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.zip
opensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.tar.gz
opensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.tar.bz2
opensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.tar.xz
Works!
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 7a7964e..7945d5e 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.ClientStack.Linden
78 public GetClientDelegate GetClient = null; 78 public GetClientDelegate GetClient = null;
79 79
80 private bool m_persistBakedTextures = false; 80 private bool m_persistBakedTextures = false;
81 private IAssetService m_assetCache; 81 private IAssetService m_assetService;
82 private bool m_dumpAssetsToFile; 82 private bool m_dumpAssetsToFile;
83 private string m_regionName; 83 private string m_regionName;
84 private object m_fetchLock = new Object(); 84 private object m_fetchLock = new Object();
@@ -95,6 +95,9 @@ namespace OpenSim.Region.ClientStack.Linden
95 m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); 95 m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
96 } 96 }
97 97
98 m_assetService = m_Scene.AssetService;
99 m_regionName = m_Scene.RegionInfo.RegionName;
100
98 RegisterHandlers(); 101 RegisterHandlers();
99 102
100 AddNewInventoryItem = m_Scene.AddUploadedInventoryItem; 103 AddNewInventoryItem = m_Scene.AddUploadedInventoryItem;
@@ -347,7 +350,7 @@ namespace OpenSim.Region.ClientStack.Linden
347 asset.Data = data; 350 asset.Data = data;
348 asset.Temporary = true; 351 asset.Temporary = true;
349 asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are 352 asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are
350 m_assetCache.Store(asset); 353 m_assetService.Store(asset);
351 } 354 }
352 355
353 /// <summary> 356 /// <summary>
@@ -476,8 +479,8 @@ namespace OpenSim.Region.ClientStack.Linden
476 asset.Data = data; 479 asset.Data = data;
477 if (AddNewAsset != null) 480 if (AddNewAsset != null)
478 AddNewAsset(asset); 481 AddNewAsset(asset);
479 else if (m_assetCache != null) 482 else if (m_assetService != null)
480 m_assetCache.Store(asset); 483 m_assetService.Store(asset);
481 484
482 InventoryItemBase item = new InventoryItemBase(); 485 InventoryItemBase item = new InventoryItemBase();
483 item.Owner = m_HostCapsObj.AgentID; 486 item.Owner = m_HostCapsObj.AgentID;