diff options
| author | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
| commit | 95738da3d82b92e82744dbc6b377a3feae2e6441 (patch) | |
| tree | cf1678c617ea644a14d20a40fbfc58f156fd9591 /indra/newview/lltexturectrl.cpp | |
| parent | 35c7c7a9b29ef4462ea969b393c25b59813ef169 (diff) | |
| parent | af401ac6dc463db477210b0ff100014fbeb50a9a (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index efe8804742..de00ca8420 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -426,7 +426,7 @@ BOOL LLFloaterTexturePicker::postBuild() mInventoryPanel->getRootFolder()->getFilter()->markDefault(); // Commented out to stop opening all folders with textures - // mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_TEXTURE); + // mInventoryPanel->openDefaultFolderForType(LLFolderType::FT_TEXTURE); // don't put keyboard focus on selected item, because the selection callback // will assume that this was user input @@ -1073,7 +1073,7 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask) { showPicker(FALSE); //grab textures first... - gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLAssetType::AT_TEXTURE)); + gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE)); //...then start full inventory fetch. gInventory.startBackgroundFetch(); handled = TRUE; |