diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 16:42:48 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 16:42:48 +0300 |
| commit | 62d9b8cbf263f93143352a33d2735a36ce5112b6 (patch) | |
| tree | f70ee2ecf319f810507a6c66fbd66ba3602c41b1 /indra/newview/llinventoryfunctions.h | |
| parent | 8d34d1a9c5ae321ce59b20f8673beed0312a41fe (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge downstream code and become version 3.8.4
Diffstat (limited to 'indra/newview/llinventoryfunctions.h')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index e6e8164e35..b93bf9a163 100755 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -461,13 +461,13 @@ struct LLInventoryAction static void doToSelected(LLInventoryModel* model, LLFolderView* root, const std::string& action, BOOL user_confirm = TRUE); static void callback_doToSelected(const LLSD& notification, const LLSD& response, class LLInventoryModel* model, class LLFolderView* root, const std::string& action); static void callback_copySelected(const LLSD& notification, const LLSD& response, class LLInventoryModel* model, class LLFolderView* root, const std::string& action); - static void removeItemFromDND(LLFolderView* root); static void onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFolderView> root); - + static void removeItemFromDND(LLFolderView* root); + private: - static void buildMarketplaceFolders(LLFolderView* root); - static void updateMarketplaceFolders(); - static std::list<LLUUID> sMarketplaceFolders; // Marketplace folders that will need update once the action is completed + static void buildMarketplaceFolders(LLFolderView* root); + static void updateMarketplaceFolders(); + static std::list<LLUUID> sMarketplaceFolders; // Marketplace folders that will need update once the action is completed }; |