summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-25 11:31:03 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-25 11:31:03 -0500
commitd159daa8d7766be78f890e2fdc2160413099970c (patch)
treefafb2060f4094401dcc6c7866d411081e5754a85
parent788dbcce6661923c6963a454fb094239cc669723 (diff)
For EXT-2584: Select and rename new folder when creating new outfit
--HG-- branch : avatar-pipeline
-rw-r--r--indra/newview/llinventorybridge.cpp2
-rw-r--r--indra/newview/llpaneloutfitsinventory.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 9421cf5716..fedc45b1fb 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2385,6 +2385,8 @@ void LLFolderBridge::folderOptionsMenu()
if (is_sidepanel)
{
mItems.clear();
+ mItems.push_back("Rename");
+ mItems.push_back("Delete");
}
// Only enable calling-card related options for non-default folders.
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
index 7769a7d172..aa0ab4efbc 100644
--- a/indra/newview/llpaneloutfitsinventory.h
+++ b/indra/newview/llpaneloutfitsinventory.h
@@ -65,10 +65,12 @@ public:
// Otherwise, return NULL.
LLFolderViewEventListener* getCorrectListenerForAction();
void setParent(LLSidepanelAppearance *parent);
+
+ LLFolderView* getRootFolder();
+
protected:
void updateParent();
bool getIsCorrectType(const LLFolderViewEventListener *listenerp) const;
- LLFolderView* getRootFolder();
private:
LLSidepanelAppearance* mParent;