diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-20 22:34:11 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-20 22:34:11 +0300 |
commit | e0ace0c722ee06f961bad6dd15abf9ba68ea540e (patch) | |
tree | cebb7ccd24bf355a576751d71d9f8736bd72b53b /indra/newview/llfloaterland.cpp | |
parent | 589a167147fd4a316f4cf588bbb2aaa103c9d3bb (diff) | |
parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) |
Merge branch 'master' into DRTVWR-570-maint-Q
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
-rw-r--r-- | indra/newview/llfloaterland.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index d78f80ad12..1a98ab9d76 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3056,7 +3056,8 @@ BOOL LLPanelLandCovenant::postBuild() { mLastRegionID = LLUUID::null; mNextUpdateTime = 0; - + mTextEstateOwner = getChild<LLTextBox>("estate_owner_text"); + mTextEstateOwner->setIsFriendCallback(LLAvatarActions::isFriend); return TRUE; } @@ -3164,8 +3165,7 @@ void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name) LLPanelLandCovenant* self = LLFloaterLand::getCurrentPanelLandCovenant(); if (self) { - LLTextBox* editor = self->getChild<LLTextBox>("estate_owner_text"); - if (editor) editor->setText(name); + self->mTextEstateOwner->setText(name); } } |