diff options
| author | skolb <none@none> | 2009-12-17 09:28:49 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-17 09:28:49 -0800 |
| commit | cbbd8dcf22f9629529b11c4c86fd9271dfaa5e24 (patch) | |
| tree | c0e5796e4704017f34ec44efbbfe703be669cd1c /indra/newview/llviewermenu.cpp | |
| parent | f713efe298c73408d59d042a0d35763a96a5bc5f (diff) | |
| parent | c08699f900bf1560f61ea05e44449e90bb02c708 (diff) | |
local merge
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()); + */ } //--------------------------------------------------------------------------- |