diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
commit | 76cf7ebf7037c2e579861c64c38fc24bde165669 (patch) | |
tree | 72152ff4ae4cb5f6422cd8c4c9830b4f76c3aa21 /indra/newview/llinspectobject.cpp | |
parent | d2d192060993d938a2fd131f8872a60b678e4a04 (diff) | |
parent | 9a15ee8a91a12020b22625873c280837739f946c (diff) |
merge
Diffstat (limited to 'indra/newview/llinspectobject.cpp')
-rw-r--r-- | indra/newview/llinspectobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp index 1a5795a2ae..91cbbbf430 100644 --- a/indra/newview/llinspectobject.cpp +++ b/indra/newview/llinspectobject.cpp @@ -51,6 +51,7 @@ #include "llmenubutton.h" #include "llresmgr.h" // getMonetaryString #include "llsafehandle.h" +#include "llsidetray.h" #include "lltextbox.h" // for description truncation #include "lltrans.h" #include "llui.h" // positionViewNearMouse() @@ -643,8 +644,9 @@ void LLInspectObject::onClickOpen() void LLInspectObject::onClickMoreInfo() { - // *TODO: Show object info side panel, once that is implemented. - LLNotificationsUtil::add("ClickUnimplemented"); + LLSD key; + key["task"] = "task"; + LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); closeFloater(); } |