summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-16 17:49:04 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-16 17:49:04 -0400
commit08515a8eb38a014ce5aedc737ab8c9abc15fccdb (patch)
treeb36798eae5491f7098f587cde2b128b967272df5 /indra
parent67185e19b423ccd31242d220a625eb4f593d4410 (diff)
EXT-7890 FIXED "Open" on folder of in-world contents does nothing
Removed "open" menu option, to be consistent with right-click options on inventory folders elsewhere.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 26f32d656f..869b8beaec 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -725,6 +725,7 @@ public:
EDragAndDropType cargo_type,
void* cargo_data);
virtual BOOL canOpenItem() const { return TRUE; }
+ virtual void openItem();
};
LLTaskCategoryBridge::LLTaskCategoryBridge(
@@ -759,7 +760,8 @@ void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
std::vector<std::string> items;
std::vector<std::string> disabled_items;
- items.push_back(std::string("Task Open"));
+ items.push_back(std::string("--no options--"));
+ disabled_items.push_back(std::string("--no options--"));
hide_context_entries(menu, items, disabled_items);
}
@@ -770,6 +772,10 @@ BOOL LLTaskCategoryBridge::hasChildren() const
return FALSE;
}
+void LLTaskCategoryBridge::openItem()
+{
+}
+
BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
{
//llinfos << "LLTaskInvFVBridge::startDrag()" << llendl;