diff options
| author | Jacek Antonelli | 2011-06-09 22:55:18 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-06-09 22:55:18 -0500 |
| commit | 28add331edfcf2837f5a439ea8a3e53b5d6ebf9a (patch) | |
| tree | 33aecb6eda546fd2d5ccd8191e5968279481fe5b /linden/indra | |
| parent | Merge remote-tracking branch 'mccabe/1.4-fbeta-inv_loading_and_ao' into next (diff) | |
| parent | Fixed landmark inventory offers not opening when automatic preview is enabled (diff) | |
| download | meta-impy-28add331edfcf2837f5a439ea8a3e53b5d6ebf9a.zip meta-impy-28add331edfcf2837f5a439ea8a3e53b5d6ebf9a.tar.gz meta-impy-28add331edfcf2837f5a439ea8a3e53b5d6ebf9a.tar.bz2 meta-impy-28add331edfcf2837f5a439ea8a3e53b5d6ebf9a.tar.xz | |
Merge remote-tracking branch 'mccabe/1.4-fbeta-landmark_preview' into next
Diffstat (limited to 'linden/indra')
| -rwxr-xr-x | linden/indra/newview/llviewermessage.cpp | 2 |
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: |