aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-06-08 12:54:58 -0700
committerMcCabe Maxsted2011-06-08 12:54:58 -0700
commitdc0a91f6fda0e07c7e838f8cb169c75599423f20 (patch)
tree3927c9abe7161e68dde54d78ceb9cb3aad494789 /linden
parentMerge branch 'view-history' into next (diff)
downloadmeta-impy-dc0a91f6fda0e07c7e838f8cb169c75599423f20.zip
meta-impy-dc0a91f6fda0e07c7e838f8cb169c75599423f20.tar.gz
meta-impy-dc0a91f6fda0e07c7e838f8cb169c75599423f20.tar.bz2
meta-impy-dc0a91f6fda0e07c7e838f8cb169c75599423f20.tar.xz
Fixed landmark inventory offers not opening when automatic preview is enabled
Diffstat (limited to 'linden')
-rwxr-xr-xlinden/indra/newview/llviewermessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 32d7172..cbcfb86 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -934,7 +934,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
934 } 934 }
935 break; 935 break;
936 case LLAssetType::AT_LANDMARK: 936 case LLAssetType::AT_LANDMARK:
937 if (!show_keep_discard) 937 if (show_keep_discard)
938 open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), FALSE, LLUUID::null, FALSE); 938 open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), FALSE, LLUUID::null, FALSE);
939 break; 939 break;
940 case LLAssetType::AT_TEXTURE: 940 case LLAssetType::AT_TEXTURE: