diff options
| author | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
| commit | 9dd7924b19651abf393f7b0dee632904a6b8e52a (patch) | |
| tree | b22f8ca3ecdf4ec8e5288102912dccdd7289f51f /indra/newview/llinspectobject.cpp | |
| parent | 301f250c1cd77711c0234d8ed4089453712f834e (diff) | |
| parent | 39fe664b97b946daf7984b946fede6f04ae731c4 (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(); } |