From c9937716aa3a1f7aac0e93fc1d58488d02d30e6e Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 9 Nov 2009 12:26:27 -0500 Subject: 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). --- indra/newview/llpanelobjectinventory.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelobjectinventory.cpp') 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("properties", mUUID); if (floater) -- cgit v1.2.3