diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-03 00:47:23 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-03 00:47:23 +0000 |
| commit | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (patch) | |
| tree | 54de76637c610b85957197c9218d77e3c8212f00 /indra/newview/llpanellandmarks.cpp | |
| parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) | |
For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Infrastructure changes for cleaning up Asset/Folder types. Associated sim changes are only so that the sim still compiles.
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index faa938c772..e0c92fd4ab 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -531,7 +531,7 @@ void LLLandmarksPanel::onAddFolderButtonClick() const menu_create_inventory_item(mCurrentSelectedList->getRootFolder() , dynamic_cast<LLFolderBridge*>(folder_bridge) , LLSD("category") - , gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK) + , gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK) ); } } |