diff options
| author | richard <none@none> | 2009-12-17 09:57:43 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 09:57:43 -0800 |
| commit | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (patch) | |
| tree | 8e77e822118f4979759caab99df48975f79994c7 /indra/newview/llviewermenu.cpp | |
| parent | f452c01915be011814d92dcc1a398f450b6ce9c2 (diff) | |
| parent | 4dd37a10633c95a9806b608b4db4d0a2d3141a21 (diff) | |
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 67858bcf9a..389603524d 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()); + */ } //--------------------------------------------------------------------------- |