diff options
| author | Diva Canto | 2010-07-04 13:56:03 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-04 13:56:03 -0700 |
| commit | 02a15bc787b2cc6784c9626e041a4365ec362194 (patch) | |
| tree | ae50c7d544052b51fc50f364832492b6d9160165 /OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |
| parent | Fixes the obvious problem in mantis #4841. Melanie needs to look at other pot... (diff) | |
| download | opensim-SC-02a15bc787b2cc6784c9626e041a4365ec362194.zip opensim-SC-02a15bc787b2cc6784c9626e041a4365ec362194.tar.gz opensim-SC-02a15bc787b2cc6784c9626e041a4365ec362194.tar.bz2 opensim-SC-02a15bc787b2cc6784c9626e041a4365ec362194.tar.xz | |
Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs index 9869a99..f6ad6e1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |||
| @@ -379,6 +379,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 379 | { | 379 | { |
| 380 | // Try the user's inventory, but only if it's different from the regions' | 380 | // Try the user's inventory, but only if it's different from the regions' |
| 381 | string userAssets = HyperAssets.GetUserAssetServer(AgentID); | 381 | string userAssets = HyperAssets.GetUserAssetServer(AgentID); |
| 382 | |||
| 382 | if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer())) | 383 | if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer())) |
| 383 | { | 384 | { |
| 384 | m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id); | 385 | m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id); |