Commit 672da8f7 authored by Cinder's avatar Cinder
Browse files

Merge

parents c69206cb a219f46b
......@@ -33,7 +33,6 @@
#include "llaccordionctrltab.h"
#include "llaccordionctrl.h"
#include "llbutton.h"
#include "lltextbox.h"
#include "lltrans.h"
// Viewer includes
......@@ -172,9 +171,10 @@ BOOL LLPanelGroup::postBuild()
mButtonCreate->setCommitCallback(boost::bind(&LLPanelGroup::onBtnCreate, this));
mButtonCreate->setVisible(false);
LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());
if (parent)
if (dynamic_cast<LLSideTrayPanelContainer*>(getParent()))
getChild<LLUICtrl>("back")->setCommitCallback(boost::bind(&LLPanelGroup::onBackBtnClick, this));
else if (LLFloater* floater = dynamic_cast<LLFloater*>(getParent()))
getChild<LLUICtrl>("back")->setCommitCallback(boost::bind(&LLPanelGroup::closeParentFloater, this));
else
getChild<LLUICtrl>("back")->setEnabled(FALSE);
......@@ -644,3 +644,9 @@ void LLPanelGroup::copyData(const LLSD& userdata)
else
LL_WARNS() << "Unhandled action: " << param << LL_ENDL;
}
void LLPanelGroup::closeParentFloater()
{
LLFloater* floater = dynamic_cast<LLFloater*>(getParent());
if (floater) floater->closeFloater();
}
......@@ -129,6 +129,7 @@ protected:
private:
void copyData(const LLSD& userdata);
void closeParentFloater();
};
using panel_multimap_t = std::unordered_multimap< LLUUID, LLPanelGroup* >;
......
......@@ -109,9 +109,10 @@ BOOL LLPanelProfileLegacy::postBuild()
mPanelPicks = static_cast<LLPanelProfilePicks*>(getChild<LLUICtrl>("picks_tab_panel"));
mPanelPicks->setProfilePanel(this);
LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());
if (parent)
if (dynamic_cast<LLSideTrayPanelContainer*>(getParent()))
getChild<LLUICtrl>("back")->setCommitCallback(boost::bind(&LLPanelProfileLegacy::onBackBtnClick, this));
else if (LLFloater* floater = dynamic_cast<LLFloater*>(getParent()))
getChild<LLUICtrl>("back")->setCommitCallback(boost::bind(&LLPanelProfileLegacy::closeParentFloater, this));
else
getChild<LLUICtrl>("back")->setEnabled(FALSE);
getChild<LLTextEditor>("sl_about")->setCommitCallback(boost::bind(&LLPanelProfileLegacy::onCommitAvatarProperties, this));
......@@ -502,6 +503,12 @@ bool LLPanelProfileLegacy::handleConfirmModifyRightsCallback(const LLSD& notific
return false;
}
void LLPanelProfileLegacy::closeParentFloater()
{
LLFloater* floater = dynamic_cast<LLFloater*>(getParent());
if (floater) floater->closeFloater();
}
void LLPanelProfileLegacy::onCommitRights()
{
if (!LLAvatarActions::isFriend(getAvatarId())) return;
......@@ -601,6 +608,7 @@ BOOL LLPanelProfileLegacy::LLPanelProfilePicks::postBuild()
{
mPicksList = getChild<LLFlatListView>("picks_list");
mClassifiedsList = getChild<LLFlatListView>("classifieds_list");
mClassifiedsList = getChild<LLFlatListView>("classifieds_list");
childSetAction("add_btn", boost::bind(&LLPanelProfilePicks::onClickPlusBtn, this));
childSetAction("teleport_btn", boost::bind(&LLPanelProfilePicks::onClickTeleport, this));
childSetAction("show_on_map_btn", boost::bind(&LLPanelProfilePicks::onClickShowOnMap, this));
......@@ -821,7 +829,7 @@ void LLPanelProfileLegacy::LLPanelProfilePicks::onClickDelete()
if (value.isDefined())
{
LLSD args;
args["PICK"] = value["pick_name"];
args["PICK"] = value[PICK_NAME];
LLNotificationsUtil::add("DeleteAvatarPick", args, LLSD(), boost::bind(&LLPanelProfilePicks::callbackDeletePick, this, _1, _2));
return;
}
......@@ -829,7 +837,7 @@ void LLPanelProfileLegacy::LLPanelProfilePicks::onClickDelete()
if (value.isDefined())
{
LLSD args;
args["NAME"] = value["classified_name"];
args["NAME"] = value[CLASSIFIED_NAME];
LLNotificationsUtil::add("DeleteClassified", args, LLSD(), boost::bind(&LLPanelProfilePicks::callbackDeleteClassified, this, _1, _2));
return;
}
......
......@@ -79,6 +79,7 @@ private:
void onNameChanged();
bool isActionEnabled(const LLSD& userdata);
bool handleConfirmModifyRightsCallback(const LLSD& notification, const LLSD& response);
void closeParentFloater();
boost::signals2::connection mAvatarNameCacheConnection;
boost::signals2::connection mNameChangedConnection;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment