diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-11 11:31:00 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-11 11:31:00 +0000 |
| commit | 9f0e4f668395eb7b55cb48a949e3aebcf46f1bcd (patch) | |
| tree | fb5a5b8ef53bef81d526f5c961cc83edbe6444c7 /indra/newview/llfloaterparcel.cpp | |
| parent | cc8305cd2075e3e19f83bd6738ef31a12d1fb4c5 (diff) | |
| parent | 3c96173fceeb882416a465dd015462f48ffc76d9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llfloaterparcel.cpp')
| -rw-r--r-- | indra/newview/llfloaterparcel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterparcel.cpp b/indra/newview/llfloaterparcel.cpp index 88a39a495f..e2be784116 100644 --- a/indra/newview/llfloaterparcel.cpp +++ b/indra/newview/llfloaterparcel.cpp @@ -40,6 +40,7 @@ // viewer project includes #include "llcommandhandler.h" #include "llpanelplace.h" +#include "llsidetray.h" // linden library includes #include "lluuid.h" @@ -70,7 +71,10 @@ public: { if (parcel_id.notNull()) { - LLFloaterReg::showInstance("parcel_info", LLSD(parcel_id)); + LLSD key; + key["type"] = "remote_place"; + key["id"] = parcel_id; + LLSideTray::getInstance()->showPanel("panel_places", key); return true; } } |