Fix SinguReplaceLinks not being respected on various user driven UI
Corrects display for Readonly Notecards, Picks, Group profiles, First/ Second Life, Classifieds, Events, Landmarks, About Land, and Region/Estate Thanks for giving me the heads-up, Beware
This commit is contained in:
@@ -715,7 +715,7 @@ void LLPanelLandGeneral::refresh()
|
||||
);
|
||||
|
||||
mEditName->setText( parcel->getName() );
|
||||
mEditDesc->setText( parcel->getDesc() );
|
||||
mEditDesc->setText( parcel->getDesc(), false );
|
||||
|
||||
BOOL for_sale = parcel->getForSale();
|
||||
|
||||
@@ -3070,7 +3070,7 @@ void LLPanelLandCovenant::updateCovenantText(const std::string &string)
|
||||
{
|
||||
LLViewerTextEditor* editor = self->getChild<LLViewerTextEditor>("covenant_editor");
|
||||
editor->setHandleEditKeysDirectly(TRUE);
|
||||
editor->setText(string);
|
||||
editor->setText(string, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2776,7 +2776,7 @@ void LLPanelEstateCovenant::updateCovenantText(const std::string& string, const
|
||||
LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
|
||||
if( panelp )
|
||||
{
|
||||
panelp->mEditor->setText(string);
|
||||
panelp->mEditor->setText(string, false);
|
||||
panelp->setCovenantID(asset_id);
|
||||
}
|
||||
}
|
||||
@@ -2823,7 +2823,7 @@ void LLPanelEstateCovenant::setOwnerName(const std::string& name)
|
||||
|
||||
void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text)
|
||||
{
|
||||
mEditor->setText(text);
|
||||
mEditor->setText(text, false);
|
||||
}
|
||||
|
||||
// key = "estateupdateinfo"
|
||||
|
||||
@@ -290,7 +290,7 @@ void LLPanelAvatarFirstLife::processProperties(void* data, EAvatarProcessorType
|
||||
if (pAvatarData && (mAvatarID == pAvatarData->avatar_id) && (pAvatarData->avatar_id != LLUUID::null))
|
||||
{
|
||||
// Teens don't get these
|
||||
getChildView("about")->setValue(pAvatarData->fl_about_text);
|
||||
getChild<LLTextEditor>("about")->setText(pAvatarData->fl_about_text, false);
|
||||
getChild<LLTextureCtrl>("img")->setImageAssetID(pAvatarData->fl_image_id);
|
||||
}
|
||||
}
|
||||
@@ -1493,7 +1493,7 @@ void LLPanelAvatar::processProperties(void* data, EAvatarProcessorType type)
|
||||
timeStructToFormattedString(&t, gSavedSettings.getString("ShortDateFormat"), born_on);
|
||||
}*/
|
||||
setOnlineStatus(pAvatarData->flags & AVATAR_ONLINE ? ONLINE_STATUS_YES : ONLINE_STATUS_NO);
|
||||
childSetValue("about", pAvatarData->about_text);
|
||||
getChild<LLTextEditor>("about")->setText(pAvatarData->about_text, false);
|
||||
}
|
||||
}
|
||||
else if (type == APT_NOTES)
|
||||
|
||||
@@ -354,7 +354,7 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t
|
||||
|
||||
// Update UI controls
|
||||
mNameEditor->setText(c_info->name);
|
||||
mDescEditor->setText(c_info->description);
|
||||
mDescEditor->setText(c_info->description, false);
|
||||
mSnapshotCtrl->setImageAssetID(c_info->snapshot_id);
|
||||
mLocationEditor->setText(location_text);
|
||||
mLocationChanged = false;
|
||||
|
||||
@@ -151,7 +151,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
|
||||
self->mTBName->setText(self->mEventInfo.mName);
|
||||
self->mTBCategory->setText(self->mEventInfo.mCategoryStr);
|
||||
self->mTBDate->setText(self->mEventInfo.mTimeStr);
|
||||
self->mTBDesc->setText(self->mEventInfo.mDesc);
|
||||
self->mTBDesc->setText(self->mEventInfo.mDesc, false);
|
||||
|
||||
self->mTBDuration->setText(llformat("%d:%.2d", self->mEventInfo.mDuration / 60, self->mEventInfo.mDuration % 60));
|
||||
|
||||
|
||||
@@ -761,7 +761,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
|
||||
|
||||
if (mEditCharter)
|
||||
{
|
||||
mEditCharter->setText(gdatap->mCharter);
|
||||
mEditCharter->setText(gdatap->mCharter, false);
|
||||
mEditCharter->resetDirty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -529,12 +529,7 @@ void LLPanelGroupNotices::showNotice(const std::string& subject,
|
||||
arrangeNoticeView(VIEW_PAST_NOTICE);
|
||||
|
||||
if(mViewSubject) mViewSubject->setText(subject);
|
||||
if (mViewMessage) {
|
||||
// We need to prune the highlights, and clear() is not doing it...
|
||||
mViewMessage->removeTextFromEnd(mViewMessage->getMaxLength());
|
||||
// Now we append the new text (setText() won't highlight URLs)
|
||||
mViewMessage->appendColoredText(message, false, false, mViewMessage->getReadOnlyFgColor());
|
||||
}
|
||||
if (mViewMessage) mViewMessage->setText(message, false);
|
||||
|
||||
if (mInventoryOffer)
|
||||
{
|
||||
|
||||
@@ -307,7 +307,7 @@ void LLPanelGroupVoting::impl::setEnableVoteProposal()
|
||||
if ( proposal_cell )
|
||||
{
|
||||
//proposal text
|
||||
mProposalText->setText(proposal_cell->getValue().asString());
|
||||
mProposalText->setText(proposal_cell->getValue().asString(), false);
|
||||
}
|
||||
else
|
||||
{ // Something's wrong... should have some text
|
||||
@@ -556,7 +556,7 @@ void LLPanelGroupVoting::impl::setEnableHistoryItem()
|
||||
const LLScrollListCell *cell = item->getColumn(5);
|
||||
if (cell)
|
||||
{
|
||||
mVoteHistoryText->setText(cell->getValue().asString());
|
||||
mVoteHistoryText->setText(cell->getValue().asString(), false);
|
||||
}
|
||||
else
|
||||
{ // Something's wrong...
|
||||
|
||||
@@ -199,7 +199,7 @@ void LLPanelPick::processProperties(void* data, EAvatarProcessorType type)
|
||||
|
||||
// Update UI controls
|
||||
mNameEditor->setText(pick_info->name);
|
||||
mDescEditor->setText(pick_info->desc);
|
||||
mDescEditor->setText(pick_info->desc, false);
|
||||
mSnapshotCtrl->setImageAssetID(pick_info->snapshot_id);
|
||||
mLocationEditor->setText(location_text);
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ BOOL LLPanelPlace::postBuild()
|
||||
void LLPanelPlace::displayItemInfo(const LLInventoryItem* pItem)
|
||||
{
|
||||
mNameEditor->setText(pItem->getName());
|
||||
mDescEditor->setText(pItem->getDescription());
|
||||
mDescEditor->setText(pItem->getDescription(), false);
|
||||
}
|
||||
|
||||
// Use this for search directory clicks, because we are totally
|
||||
@@ -248,7 +248,7 @@ void LLPanelPlace::processParcelInfo(const LLParcelData& parcel_data)
|
||||
if( !parcel_data.desc.empty()
|
||||
&& mDescEditor && mDescEditor->getText().empty())
|
||||
{
|
||||
mDescEditor->setText(parcel_data.desc);
|
||||
mDescEditor->setText(parcel_data.desc, false);
|
||||
}
|
||||
|
||||
std::string info_text;
|
||||
|
||||
@@ -405,7 +405,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
|
||||
else
|
||||
{
|
||||
// Version 0 (just text, doesn't include version number)
|
||||
previewEditor->setText(LLStringExplicit(buffer));
|
||||
previewEditor->setText(LLStringExplicit(buffer), false);
|
||||
}
|
||||
|
||||
previewEditor->makePristine();
|
||||
|
||||
Reference in New Issue
Block a user