diff options
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 30 | ||||
| -rw-r--r-- | indra/newview/llfloaterland.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about_land.xml | 24 |
3 files changed, 3 insertions, 53 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 5c5219bcdd..750d218f52 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -466,9 +466,6 @@ bool LLPanelLandGeneral::postBuild() mContentRating = getChild<LLTextBox>("ContentRatingText"); mLandType = getChild<LLTextBox>("LandTypeText"); - mBtnProfile = getChild<LLButton>("Profile..."); - mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this)); - mTextGroupLabel = getChild<LLTextBox>("Group:"); mTextGroup = getChild<LLTextBox>("GroupText"); @@ -599,8 +596,6 @@ void LLPanelLandGeneral::refresh() mTextOwner->setText(LLStringUtil::null); mContentRating->setText(LLStringUtil::null); mLandType->setText(LLStringUtil::null); - mBtnProfile->setLabel(getString("profile_text")); - mBtnProfile->setEnabled(false); mTextClaimDate->setText(LLStringUtil::null); mTextGroup->setText(LLStringUtil::null); @@ -682,7 +677,6 @@ void LLPanelLandGeneral::refresh() mTextSalePending->setEnabled(false); mTextOwner->setText(getString("public_text")); mTextOwner->setEnabled(false); - mBtnProfile->setEnabled(false); mTextClaimDate->setText(LLStringUtil::null); mTextClaimDate->setEnabled(false); mTextGroup->setText(getString("none_text")); @@ -711,21 +705,14 @@ void LLPanelLandGeneral::refresh() //refreshNames(); mTextOwner->setEnabled(true); - // We support both group and personal profiles - mBtnProfile->setEnabled(true); - if (parcel->getGroupID().isNull()) { - // Not group owned, so "Profile" - mBtnProfile->setLabel(getString("profile_text")); mTextGroup->setText(getString("none_text")); mTextGroup->setEnabled(false); } else { - // Group owned, so "Info" - mBtnProfile->setLabel(getString("info_text")); //mTextGroup->setText("HIPPOS!");//parcel->getGroupName()); mTextGroup->setEnabled(true); @@ -959,23 +946,6 @@ 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); - } -} - // public void LLPanelLandGeneral::setGroup(const LLUUID& group_id) { diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index 8af0caab33..79e5da042f 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -146,7 +146,6 @@ public: virtual void draw(); void setGroup(const LLUUID& group_id); - void onClickProfile(); void onClickSetGroup(); static void onClickDeed(void*); static void onClickBuyLand(void* data); @@ -193,7 +192,6 @@ protected: LLTextBox* mTextOwnerLabel; LLTextBox* mTextOwner; - LLButton* mBtnProfile; LLTextBox* mContentRating; LLTextBox* mLandType; diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index ffb9c0f78e..eeac4ed25f 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -253,17 +253,9 @@ image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" - name="info_btn" + name="info_btn_owner" top_delta="-2" width="16" /> - <!-- <button - follows="left|top" - height="23" - label="Profile" - layout="topleft" - left_pad="4" - name="Profile..." - width="90" />--> <text type="string" length="1" @@ -272,11 +264,10 @@ layout="topleft" left="10" name="Group:" - top_pad="7" + top_pad="13" width="100"> Group: </text> - <!--TODO: HOOK UP GROUP ICON--> <text follows="left|top" height="16" @@ -287,15 +278,6 @@ width="240"> TestString PleaseIgnore </text> - <button - follows="right" - height="23" - image_pressed="Info_Press" - image_unselected="Info_Over" - left_pad="3" - name="info_btn" - top_delta="-2" - width="16" /> <button follows="left|top" height="23" @@ -305,7 +287,7 @@ right="-154" name="Set..." width="90" - top_delta="-2"/> + top_delta="-5"/> <check_box enabled="false" height="16" |