diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-15 16:12:24 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-15 16:12:24 -0500 |
| commit | 109de76574c7fe1944a1330972d796de7894882c (patch) | |
| tree | 8129f36f44628700cdcf92bfe01417c7a0b12496 /indra/newview/llviewermenu.cpp | |
| parent | 0905d857614153e682032ab4630468708812707a (diff) | |
| parent | fbf5d1a99221d54c242b67ffcf13d5510b5ce0a7 (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 36d9e7935f..e38d03c60b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2519,8 +2519,6 @@ void handle_object_edit() void handle_object_inspect() { - // Disable sidepanel inspector - /* LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); LLViewerObject* selected_objectp = selection->getFirstRootObject(); if (selected_objectp) @@ -2529,9 +2527,11 @@ void handle_object_inspect() key["task"] = "task"; LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); } - */ + /* + // Old floater properties LLFloaterReg::showInstance("inspect", LLSD()); + */ } //--------------------------------------------------------------------------- |