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/llviewermenu.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/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 07d073c3a9..4d4ad1c022 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2634,6 +2634,8 @@ void handle_object_edit() void handle_object_inspect() { + // Disable sidepanel inspector + /* LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); LLViewerObject* selected_objectp = selection->getFirstRootObject(); if (selected_objectp) @@ -2642,6 +2644,7 @@ void handle_object_inspect() key["task"] = "task"; LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); } + */ LLFloaterReg::showInstance("inspect", LLSD()); } |