diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-10 20:13:17 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-10 20:13:17 +0200 |
| commit | ebbca6470aa04c29712d92f6b52467188663e055 (patch) | |
| tree | 13b62d698ebc48d9efa1d65991744c71f9ff407e /indra/newview/llpanelobjectinventory.cpp | |
| parent | f15767bbef4e0a87aa032e265b3a0a8d4db907e1 (diff) | |
| parent | c673ef4a913691cea8e94b688937084edb821f68 (diff) | |
merge
--HG--
branch : product-engine
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) |