diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:04 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:04 -0800 |
| commit | dc5db676efd340bccd2c6f376c0bcba77e0507c4 (patch) | |
| tree | aba1c368d923d106789cddc59b5e4626f048dc44 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 2b5faa0b9cac3736b9d96a68cd13e05ee39ab7d1 (diff) | |
| parent | 3b98043d227db07a2396b1fba056e911abd04621 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 79b33e29f5..a5e9407a41 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -165,7 +165,9 @@ void LLTaskInvFVBridge::showProperties() key["object"] = mPanel->getTaskUUID(); key["id"] = mUUID; LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); - + + + // Disable old properties floater; this is replaced by the sidepanel. /* LLFloaterProperties* floater = LLFloaterReg::showTypedInstance<LLFloaterProperties>("properties", mUUID); if (floater) |