diff options
author | Justin Clarke Casey | 2007-12-22 16:45:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-22 16:45:44 +0000 |
commit | ed0f8bd5728d0fbe992cc4a1d164983edda654e8 (patch) | |
tree | 071707a559b2600101cbfe241e289f75196d555a /OpenSim/Region | |
parent | Put in some race revealing warning messages triggered when a user rezzes a sc... (diff) | |
download | opensim-SC_OLD-ed0f8bd5728d0fbe992cc4a1d164983edda654e8.zip opensim-SC_OLD-ed0f8bd5728d0fbe992cc4a1d164983edda654e8.tar.gz opensim-SC_OLD-ed0f8bd5728d0fbe992cc4a1d164983edda654e8.tar.bz2 opensim-SC_OLD-ed0f8bd5728d0fbe992cc4a1d164983edda654e8.tar.xz |
minor refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 86591ec..34a9b09 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -3106,7 +3106,7 @@ namespace OpenSim.Region.ClientStack | |||
3106 | 3106 | ||
3107 | // Fetch landmark | 3107 | // Fetch landmark |
3108 | LLUUID lmid = tpReq.Info.LandmarkID; | 3108 | LLUUID lmid = tpReq.Info.LandmarkID; |
3109 | AssetBase lma = m_assetCache.GetAsset(lmid); | 3109 | AssetBase lma = m_assetCache.GetAsset(lmid, false); |
3110 | if (lma != null) | 3110 | if (lma != null) |
3111 | { | 3111 | { |
3112 | AssetLandmark lm = new AssetLandmark(lma); | 3112 | AssetLandmark lm = new AssetLandmark(lma); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 86cb38d..efd96d2 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -146,7 +146,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
146 | if (transactions != null) | 146 | if (transactions != null) |
147 | { | 147 | { |
148 | LLUUID assetID = libsecondlife.LLUUID.Combine(transactionID, remoteClient.SecureSessionId); | 148 | LLUUID assetID = libsecondlife.LLUUID.Combine(transactionID, remoteClient.SecureSessionId); |
149 | AssetBase asset = AssetCache.GetAsset(assetID); | 149 | AssetBase asset |
150 | = AssetCache.GetAsset( | ||
151 | assetID, (item.assetType == (int)AssetType.Texture ? true : false)); | ||
150 | 152 | ||
151 | if (asset == null) | 153 | if (asset == null) |
152 | { | 154 | { |