diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-03 21:27:02 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-03 21:27:02 -0500 |
| commit | 13aa8f8faaaefea59531a970bd0b6fe1d947b756 (patch) | |
| tree | eed11e430e7ce490be7b92029cfe5250f09272d5 /indra | |
| parent | 3af25f185c4b28b1d629a10acb938d01a7f56090 (diff) | |
EXT-4344 : Object Inspector has "Sorry, not implemented yet"
Added sidetray object inspector code.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinspectobject.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 8 |
2 files changed, 4 insertions, 10 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(); } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 636db2b59b..5c37ef75b5 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -391,14 +391,6 @@ Add this Ability to '[ROLE_NAME]'? notext="No" yestext="Yes"/> </notification> - - <notification - icon="alertmodal.tga" - name="ClickUnimplemented" - type="alertmodal"> -Sorry, not implemented yet. - </notification> - <notification icon="alertmodal.tga" name="JoinGroupCanAfford" |