diff options
| author | callum <none@none> | 2009-12-16 14:34:13 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-16 14:34:13 -0800 |
| commit | 17ea8bfa9ea69b1022d0f8754732c479fe5a7f6b (patch) | |
| tree | c2b18373bad5e9856cf3edf226783c8767230559 /indra/newview/llviewermenu.cpp | |
| parent | 828694987cce58b88143e3a2c5bd55a10e6afc24 (diff) | |
| parent | d3ca545687945054c666359e78ada94949732205 (diff) | |
Merge with tip
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()); + */ } //--------------------------------------------------------------------------- |