diff options
author | angela <angela@lindenlab.com> | 2009-11-04 12:33:52 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-04 12:33:52 +0800 |
commit | 61603ca9d55c76219093cb7000e7f75e539bf5fe (patch) | |
tree | b1528b99061758e0f7b8fdaaa8754c2169036d89 /indra/newview/llpreview.cpp | |
parent | 1190b5d9eb6f1e1d698430957b99872abd354f81 (diff) | |
parent | 6e9fe077277b50634b125084f52da55fa8cb84d9 (diff) |
mergre
Diffstat (limited to 'indra/newview/llpreview.cpp')
-rw-r--r-- | indra/newview/llpreview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 34e78b5c46..b06e70c00a 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -45,7 +45,6 @@ #include "lltooldraganddrop.h" #include "llradiogroup.h" #include "llassetstorage.h" -#include "llviewerassettype.h" #include "llviewerobject.h" #include "llviewerobjectlist.h" #include "lldbstrings.h" @@ -318,7 +317,7 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask) && LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y)) { EDragAndDropType type; - type = LLViewerAssetType::lookupDragAndDropType(item->getType()); + type = LLAssetType::lookupDragAndDropType(item->getType()); LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_LIBRARY; if(!mObjectUUID.isNull()) { @@ -407,7 +406,7 @@ void LLPreview::onDiscardBtn(void* data) */ // Move the item to the trash - const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); + LLUUID trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH); if (item->getParentUUID() != trash_id) { LLInventoryModel::update_list_t update; |