diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
| commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
| tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/newview/llinspectobject.cpp | |
| parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
| parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) | |
merge up from viewer-pre-beta
Diffstat (limited to 'indra/newview/llinspectobject.cpp')
| -rw-r--r-- | indra/newview/llinspectobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp index ee076f68ea..acc139c569 100644 --- a/indra/newview/llinspectobject.cpp +++ b/indra/newview/llinspectobject.cpp @@ -28,6 +28,7 @@ #include "llinspectobject.h" // Viewer +#include "llfloatersidepanelcontainer.h" #include "llinspect.h" #include "llmediaentry.h" #include "llnotificationsutil.h" // *TODO: Eliminate, add LLNotificationsUtil wrapper @@ -45,7 +46,6 @@ #include "llmenubutton.h" #include "llresmgr.h" // getMonetaryString #include "llsafehandle.h" -#include "llsidetray.h" #include "lltextbox.h" // for description truncation #include "lltoggleablemenu.h" #include "lltrans.h" @@ -640,7 +640,7 @@ void LLInspectObject::onClickMoreInfo() { LLSD key; key["task"] = "task"; - LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); + LLFloaterSidePanelContainer::showPanel("inventory", key); closeFloater(); } |