diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 02:17:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 02:17:01 +0000 |
| commit | ea1bfae838c59e24ec1a962f7d015d609b63d083 (patch) | |
| tree | 4fb1bc94522313df13a6d329cd8fef29d099a46d /indra/newview/llpanelplaces.cpp | |
| parent | 8103710c054ec6ea4a46f9732e569e543691184b (diff) | |
Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index b2541ac1b0..f30bb1a0a6 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -635,20 +635,21 @@ void LLPanelPlaces::onOverflowMenuItemClicked(const LLSD& param) if (mPickPanel == NULL) { - mPickPanel = new LLPanelPick(); + mPickPanel = LLPanelPickEdit::create(); addChild(mPickPanel); mPickPanel->setExitCallback(boost::bind(&LLPanelPlaces::togglePickPanel, this, FALSE)); + mPickPanel->setCancelCallback(boost::bind(&LLPanelPlaces::togglePickPanel, this, FALSE)); + mPickPanel->setSaveCallback(boost::bind(&LLPanelPlaces::togglePickPanel, this, FALSE)); } togglePickPanel(TRUE); + mPickPanel->onOpen(LLSD()); + mPlaceInfo->createPick(mPosGlobal, mPickPanel); LLRect rect = getRect(); mPickPanel->reshape(rect.getWidth(), rect.getHeight()); mPickPanel->setRect(rect); - mPickPanel->setEditMode(TRUE); - - mPlaceInfo->createPick(mPosGlobal, mPickPanel); } else if (item == "add_to_favbar") { |