diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 240309ec1e..3320be1bd1 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -392,8 +392,9 @@ BOOL LLPanelLandGeneral::postBuild() mContentRating = getChild("ContentRatingText"); mLandType = getChild("LandTypeText"); - mBtnProfile = getChild("Profile..."); - mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this)); + // Doesn't exists as of 2014-04-14 + //mBtnProfile = getChild("Profile..."); + //mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this)); mTextGroupLabel = getChild("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); + // 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); + // 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); + // 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")); + // 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")); + // 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); - } -} +// 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); +// } +//} +// // public void LLPanelLandGeneral::setGroup(const LLUUID& group_id) diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index 363181035c..afc62b2f0d 100755 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -140,7 +140,8 @@ public: virtual void draw(); void setGroup(const LLUUID& group_id); - void onClickProfile(); + // 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; + // Doesn't exists as of 2014-04-14 + //LLButton* mBtnProfile; LLTextBox* mContentRating; LLTextBox* mLandType; diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp index 26cd3ff1c1..2d7722d00f 100755 --- a/indra/newview/llpanellandmedia.cpp +++ b/indra/newview/llpanellandmedia.cpp @@ -136,7 +136,8 @@ void LLPanelLandMedia::refresh() mMediaURLEdit->setText(parcel->getMediaURL()); mMediaURLEdit->setEnabled( FALSE ); - getChild("current_url")->setValue(parcel->getMediaCurrentURL()); + // Doesn't exists as of 2014-04-14 + //getChild("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("current_url")->setValue(media_url); + // Doesn't exists as of 2014-04-14 + //getChild("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(); + // Doesn't exists as of 2014-04-14 + //LLParcel* parcel = self->mParcel->getParcel(); // LLViewerMedia::navigateHome(); self->refresh(); - self->getChild("current_url")->setValue(parcel->getMediaURL()); + // Doesn't exists as of 2014-04-14 + //self->getChild("current_url")->setValue(parcel->getMediaURL()); // LLViewerParcelMedia::sendMediaNavigateMessage(parcel->getMediaURL()); }