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

Transplant changes from LLChatHistory to FSChatHistory

Ansariel 2014-03-18 19:10:29 +01:00
parent 649a9dbbb4
commit fb0c1d4a93
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/fschathistory.cpp
View File

@ -645,6 +645,7 @@ protected:
menu->setItemEnabled("Request Teleport",false);
menu->setItemEnabled("Teleport to",false);
menu->setItemEnabled("Voice Call", false);
menu->setItemEnabled("Chat History", false);
menu->setItemEnabled("Add Contact Set", false);
menu->setItemEnabled("Invite Group", false);
menu->setItemEnabled("Zoom In", false);
@ -668,9 +669,9 @@ protected:
menu->setItemEnabled("track", FSCommon::checkIsActionEnabled(mAvatarID, FS_RGSTR_ACT_TRACK_AVATAR));
menu->setItemEnabled("Block Unblock", LLAvatarActions::canBlock(mAvatarID));
menu->setItemEnabled("Mute Text", LLAvatarActions::canBlock(mAvatarID));
menu->setItemEnabled("Chat History", LLLogChat::isTranscriptExist(mAvatarID));
}
menu->setItemEnabled("Chat History", LLLogChat::isTranscriptExist(mAvatarID));
menu->setItemEnabled("Map", (LLAvatarTracker::instance().isBuddyOnline(mAvatarID) && is_agent_mappable(mAvatarID)) || gAgent.isGodlike() );
menu->buildDrawLabels();
menu->updateParent(LLMenuGL::sMenuContainer);

3
indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml
View File

@ -15,7 +15,8 @@
name="chat_history"
type="string"
word_wrap="true"
line_spacing.multiple="1.0"
line_spacing.multiple="1.0"
trusted_content="false"
font="SansSerif"
bg_visible="true"
bg_readonly_color="FSChatHistoryBackground">