diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-09 12:26:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-09 12:26:27 -0500 |
| commit | c9937716aa3a1f7aac0e93fc1d58488d02d30e6e (patch) | |
| tree | 17b8c4eafea2daa3300e4dc4ffee3db3c426adc7 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 90d985946ce167a313e2765728caf2652931dfdd (diff) | |
EXT-1866 : Inventory Side Panel
Various trivial UI behavioral changes for disabling/enabling old/new floaters when bringing up properties of objects/items.
This is to make the UI behavior compliant with the Inventory Panel MVP.
Also added missing sidepanel_task_info.xml (although this is not actually enabled for viewer2.0).
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) |