diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-10 17:03:48 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-10 17:03:48 +0200 |
| commit | ebfb32f35bfeb796b4971f66bd1a9ebdf88be854 (patch) | |
| tree | 12a2fd956a69147758226f49a437a137f065410f /indra/newview/llpanelobjectinventory.cpp | |
| parent | 15372bbc342a7b4c7a8d9b2e1bedd52655232ba7 (diff) | |
| parent | 5377f8628e7f3eda9f497db1c367099ca04726d0 (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) |