diff options
| author | Richard Nelson <none@none> | 2010-06-17 15:54:27 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-17 15:54:27 -0700 |
| commit | b52044cf26b1c0d82bd59bb16cd04edd53b0cc69 (patch) | |
| tree | 182e452d990f90c62cabda24a11b16793770fcf2 /indra/newview/llpanelobjectinventory.cpp | |
| parent | cd12d50cb2ce1ad634dc800c9d0cda6745559a47 (diff) | |
| parent | 4aef5f54de70a8d729c93f7eb11995a7d23feed0 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index da809b7baa..f683cbc8d0 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -176,17 +176,7 @@ LLInventoryItem* LLTaskInvFVBridge::findItem() const void LLTaskInvFVBridge::showProperties() { - show_item_profile(mUUID); - - // Disable old properties floater; this is replaced by the sidepanel. - /* - LLFloaterProperties* floater = LLFloaterReg::showTypedInstance<LLFloaterProperties>("properties", mUUID); - if (floater) - { - floater->setObjectID(mPanel->getTaskUUID()); - } - */ - + show_task_item_profile(mUUID, mPanel->getTaskUUID()); } struct LLBuyInvItemData |