diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-12 09:23:57 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-12 09:23:57 -0800 |
| commit | 3dd79ad226bc8e0aec18dba87223a3f50ecf360b (patch) | |
| tree | 2af4f4e5d50d35065dda3101b60b40a3c1c21aee /indra/newview/llpanelobjectinventory.cpp | |
| parent | 72af8dc3f0a249f69869bc6f52dd7a887702a964 (diff) | |
| parent | 7a45dec2d540581ef080386e4a967befd22b6adb (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) |