summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-08 13:05:29 -0600
committerDave Parks <davep@lindenlab.com>2012-11-08 13:05:29 -0600
commitc431ddf629b7f1149c44b2063d216dd34bcd2b12 (patch)
tree7c625873abf2ad80fc25e90e073ff0fcc2e619ab /indra/newview/llselectmgr.cpp
parentb76b81ff811014012856f58970c1aac093507557 (diff)
parent8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index c3c37141ed..13845c3b38 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5058,13 +5058,6 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
dialog_refresh_all();
- // silly hack to allow 'save into inventory'
- if(gPopupMenuView->getVisible())
- {
- gPopupMenuView->setItemEnabled(SAVE_INTO_INVENTORY,
- enable_save_into_inventory(NULL));
- }
-
// hack for left-click buy object
LLToolPie::selectionPropertiesReceived();
}