diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-16 10:14:18 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-16 10:14:18 -0500 |
| commit | 1e5f2f5d8c4264cc704c687aa1b624296b6444e2 (patch) | |
| tree | 196523240afeda48f4e4dd1c3703eb088b522ba0 /indra/newview/llviewermenu.cpp | |
| parent | 3eea3281af4277e9b0201dab60f6579b6140a9d0 (diff) | |
| parent | 073ec70829723e54f822052fe9c6c3e998e8dfca (diff) | |
automated merge avp->viewer2.0
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 0be0b56bc3..dfa775c292 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2529,8 +2529,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) @@ -2539,9 +2537,11 @@ void handle_object_inspect() key["task"] = "task"; LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); } - */ + /* + // Old floater properties LLFloaterReg::showInstance("inspect", LLSD()); + */ } //--------------------------------------------------------------------------- |