diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-10 16:05:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-10 16:05:53 +0200 |
| commit | c3d9aa60a799bb45b32c09870f92d576c9b571ce (patch) | |
| tree | 2fef4c4b45d63140535d46f61bd104b14ba8c920 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 7dabb3c46e6cdf208ce7dc46b89f431a247d6ba6 (diff) | |
| parent | 93adff4569d66d0a8699615b7a21d789921ca15c (diff) | |
Merge from default branch
--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) |