livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warnings: 

* LLView::getChild: Making dummy class LLButton named "Profile..." in land_general_panel
* LLView::getChild: Making dummy class LLUICtrl named "current_url" in land_media_panel
Ansariel 2014-04-11 14:05:08 +02:00
parent 6a9859850d
commit 0bd16e2e20
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
indra/newview/llfloaterland.cpp
View File

@ -392,8 +392,9 @@ BOOL LLPanelLandGeneral::postBuild()
mContentRating = getChild<LLTextBox>("ContentRatingText");
mLandType = getChild<LLTextBox>("LandTypeText");
mBtnProfile = getChild<LLButton>("Profile...");
mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this));
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//mBtnProfile = getChild<LLButton>("Profile...");
//mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this));
mTextGroupLabel = getChild<LLTextBox>("Group:");
@ -540,8 +541,9 @@ void LLPanelLandGeneral::refresh()
mTextOwner->setText(LLStringUtil::null);
mContentRating->setText(LLStringUtil::null);
mLandType->setText(LLStringUtil::null);
mBtnProfile->setLabel(getString("profile_text"));
mBtnProfile->setEnabled(FALSE);
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//mBtnProfile->setLabel(getString("profile_text"));
//mBtnProfile->setEnabled(FALSE);
mTextClaimDate->setText(LLStringUtil::null);
mTextGroup->setText(LLStringUtil::null);
@ -603,7 +605,8 @@ void LLPanelLandGeneral::refresh()
mTextSalePending->setEnabled(FALSE);
mTextOwner->setText(getString("public_text"));
mTextOwner->setEnabled(FALSE);
mBtnProfile->setEnabled(FALSE);
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//mBtnProfile->setEnabled(FALSE);
mTextClaimDate->setText(LLStringUtil::null);
mTextClaimDate->setEnabled(FALSE);
mTextGroup->setText(getString("none_text"));
@ -633,12 +636,14 @@ void LLPanelLandGeneral::refresh()
mTextOwner->setEnabled(TRUE);
// We support both group and personal profiles
mBtnProfile->setEnabled(TRUE);
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//mBtnProfile->setEnabled(TRUE);
if (parcel->getGroupID().isNull())
{
// Not group owned, so "Profile"
mBtnProfile->setLabel(getString("profile_text"));
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//mBtnProfile->setLabel(getString("profile_text"));
mTextGroup->setText(getString("none_text"));
mTextGroup->setEnabled(FALSE);
@ -646,7 +651,8 @@ void LLPanelLandGeneral::refresh()
else
{
// Group owned, so "Info"
mBtnProfile->setLabel(getString("info_text"));
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//mBtnProfile->setLabel(getString("info_text"));
//mTextGroup->setText("HIPPOS!");//parcel->getGroupName());
mTextGroup->setEnabled(TRUE);
@ -914,22 +920,24 @@ void LLPanelLandGeneral::onClickSetGroup()
}
}
void LLPanelLandGeneral::onClickProfile()
{
LLParcel* parcel = mParcel->getParcel();
if (!parcel) return;
if (parcel->getIsGroupOwned())
{
const LLUUID& group_id = parcel->getGroupID();
LLGroupActions::show(group_id);
}
else
{
const LLUUID& avatar_id = parcel->getOwnerID();
LLAvatarActions::showProfile(avatar_id);
}
}
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//void LLPanelLandGeneral::onClickProfile()
//{
// LLParcel* parcel = mParcel->getParcel();
// if (!parcel) return;
//
// if (parcel->getIsGroupOwned())
// {
// const LLUUID& group_id = parcel->getGroupID();
// LLGroupActions::show(group_id);
// }
// else
// {
// const LLUUID& avatar_id = parcel->getOwnerID();
// LLAvatarActions::showProfile(avatar_id);
// }
//}
// </FS:Ansariel>
// public
void LLPanelLandGeneral::setGroup(const LLUUID& group_id)

6
indra/newview/llfloaterland.h
View File

@ -140,7 +140,8 @@ public:
virtual void draw();
void setGroup(const LLUUID& group_id);
void onClickProfile();
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//void onClickProfile();
void onClickSetGroup();
static void onClickDeed(void*);
static void onClickBuyLand(void* data);
@ -188,7 +189,8 @@ protected:
LLTextBox* mTextOwnerLabel;
LLTextBox* mTextOwner;
LLButton* mBtnProfile;
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//LLButton* mBtnProfile;
LLTextBox* mContentRating;
LLTextBox* mLandType;

12
indra/newview/llpanellandmedia.cpp
View File

@ -136,7 +136,8 @@ void LLPanelLandMedia::refresh()
mMediaURLEdit->setText(parcel->getMediaURL());
mMediaURLEdit->setEnabled( FALSE );
getChild<LLUICtrl>("current_url")->setValue(parcel->getMediaCurrentURL());
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//getChild<LLUICtrl>("current_url")->setValue(parcel->getMediaCurrentURL());
mMediaDescEdit->setText(parcel->getMediaDesc());
mMediaDescEdit->setEnabled( can_change_media );
@ -241,7 +242,8 @@ void LLPanelLandMedia::setMediaURL(const std::string& media_url)
mMediaURLEdit->onCommit();
// LLViewerParcelMedia::sendMediaNavigateMessage(media_url);
getChild<LLUICtrl>("current_url")->setValue(media_url);
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//getChild<LLUICtrl>("current_url")->setValue(media_url);
}
std::string LLPanelLandMedia::getMediaURL()
{
@ -321,10 +323,12 @@ void LLPanelLandMedia::onSetBtn(void *userdata)
void LLPanelLandMedia::onResetBtn(void *userdata)
{
LLPanelLandMedia *self = (LLPanelLandMedia *)userdata;
LLParcel* parcel = self->mParcel->getParcel();
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//LLParcel* parcel = self->mParcel->getParcel();
// LLViewerMedia::navigateHome();
self->refresh();
self->getChild<LLUICtrl>("current_url")->setValue(parcel->getMediaURL());
// <FS:Ansariel> Doesn't exists as of 2014-04-14
//self->getChild<LLUICtrl>("current_url")->setValue(parcel->getMediaURL());
// LLViewerParcelMedia::sendMediaNavigateMessage(parcel->getMediaURL());
}