diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-18 10:18:08 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-18 10:18:08 -0400 |
| commit | 172e8edcb0cfa1a0f68ce4d8bcb89c9d53659585 (patch) | |
| tree | 6668062a9c8eac989e9c43a579b4e8d06256b76f /indra/newview/llpanelobjectinventory.cpp | |
| parent | d3b9c8944b7730b54796ef79cd78d62fd585fe42 (diff) | |
| parent | cb50a2395bc37f1f7833171a976f67af9f2df66d (diff) | |
automated merge
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 869b8beaec..ca1361c84b 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -177,17 +177,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 |