From a81ecc20067b48cf8a757e9c117cbfb977448449 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 27 Nov 2014 12:45:55 -0500 Subject: [PATCH] Introduce LLInventoryAction namespace, move doToSelected into it. --- indra/newview/llinventoryactions.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/indra/newview/llinventoryactions.cpp b/indra/newview/llinventoryactions.cpp index 20fe180d7..b647e28ee 100644 --- a/indra/newview/llinventoryactions.cpp +++ b/indra/newview/llinventoryactions.cpp @@ -60,12 +60,17 @@ extern LLUUID gAgentID; using namespace LLOldEvents; +namespace LLInventoryAction +{ + bool doToSelected(LLFolderView* folder, std::string action); +} + typedef LLMemberListener object_inventory_listener_t; typedef LLMemberListener inventory_listener_t; typedef LLMemberListener inventory_panel_listener_t; -bool doToSelected(LLFolderView* folder, std::string action) { +bool LLInventoryAction::doToSelected(LLFolderView* folder, std::string action) LLInventoryModel* model = &gInventory; if ("rename" == action) { @@ -136,7 +141,7 @@ class LLDoToSelectedPanel : public object_inventory_listener_t LLFolderView* folder = panel->getRootFolder(); if(!folder) return true; - return doToSelected(folder, userdata.asString()); + return LLInventoryAction::doToSelected(folder, userdata.asString()); } }; @@ -148,7 +153,7 @@ class LLDoToSelectedFloater : public inventory_listener_t LLFolderView* folder = panel->getRootFolder(); if(!folder) return true; - return doToSelected(folder, userdata.asString()); + return LLInventoryAction::doToSelected(folder, userdata.asString()); } }; @@ -160,7 +165,7 @@ class LLDoToSelected : public inventory_panel_listener_t LLFolderView* folder = panel->getRootFolder(); if(!folder) return true; - return doToSelected(folder, userdata.asString()); + return LLInventoryAction::doToSelected(folder, userdata.asString()); } };