diff options
| author | Mic Bowman | 2013-06-10 13:26:19 -0700 |
|---|---|---|
| committer | Mic Bowman | 2013-06-10 13:26:19 -0700 |
| commit | 57141e34bf415861a8acfdaa0086e0e651c679d9 (patch) | |
| tree | 98b18a19c85be49bcb980c074558455bd28c462c /OpenSim/Region | |
| parent | Mantis 5346: llAxisAngle2Rot() should normalize before computing (diff) | |
| download | opensim-SC-57141e34bf415861a8acfdaa0086e0e651c679d9.zip opensim-SC-57141e34bf415861a8acfdaa0086e0e651c679d9.tar.gz opensim-SC-57141e34bf415861a8acfdaa0086e0e651c679d9.tar.bz2 opensim-SC-57141e34bf415861a8acfdaa0086e0e651c679d9.tar.xz | |
Remove Temporary from use to shortcut asset stores. The Local property
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs index d221d68..9f58175 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | |||
| @@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
| 322 | // a copy of the local asset. | 322 | // a copy of the local asset. |
| 323 | m_Cache.Cache(asset); | 323 | m_Cache.Cache(asset); |
| 324 | 324 | ||
| 325 | if (asset.Temporary || asset.Local) | 325 | if (asset.Local) |
| 326 | { | 326 | { |
| 327 | if (m_Cache != null) | 327 | if (m_Cache != null) |
| 328 | m_Cache.Cache(asset); | 328 | m_Cache.Cache(asset); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index 480cd69..52b1039 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | |||
| @@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
| 258 | if (m_Cache != null) | 258 | if (m_Cache != null) |
| 259 | m_Cache.Cache(asset); | 259 | m_Cache.Cache(asset); |
| 260 | 260 | ||
| 261 | if (asset.Temporary || asset.Local) | 261 | if (asset.Local) |
| 262 | { | 262 | { |
| 263 | // m_log.DebugFormat( | 263 | // m_log.DebugFormat( |
| 264 | // "[LOCAL ASSET SERVICE CONNECTOR]: Returning asset {0} {1} without querying database since status Temporary = {2}, Local = {3}", | 264 | // "[LOCAL ASSET SERVICE CONNECTOR]: Returning asset {0} {1} without querying database since status Temporary = {2}, Local = {3}", |