diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
| commit | f26f7e3e29019abf3a10f6925e30baca19eb4e2d (patch) | |
| tree | 071fd0d451b482c9dd8376479b968da4aa099a78 /indra/newview/lllocationinputctrl.cpp | |
| parent | c5d100a9e4595c0d3bc685e0d6a2972ef228013d (diff) | |
merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index c7ef6e16f7..99f6823ba1 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -50,7 +50,6 @@ #include "llinventorymodel.h" #include "lllandmarklist.h" #include "lllocationhistory.h" -#include "llpanelplaces.h" #include "llsidetray.h" #include "llviewerinventory.h" #include "llviewerparcelmgr.h" @@ -352,10 +351,7 @@ void LLLocationInputCtrl::onFocusLost() void LLLocationInputCtrl::onInfoButtonClicked() { - LLSD key; - key["type"] = LLPanelPlaces::AGENT; - - LLSideTray::getInstance()->showPanel("panel_places", key); + LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "agent")); } void LLLocationInputCtrl::onAddLandmarkButtonClicked() |