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

merge 

--HG--
branch : product-engine
meow-7.2.2
Igor Borovkov 2009-12-17 17:50:06 +02:00
parent 30f3397e35 a332ec1608
commit b0e984e58a
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llavataractions.cpp
View File

@ -264,11 +264,8 @@ bool LLAvatarActions::isCalling(const LLUUID &id)
//static
bool LLAvatarActions::canCall(const LLUUID &id)
{
if(isFriend(id))
{
return LLAvatarTracker::instance().isBuddyOnline(id) && LLVoiceClient::voiceEnabled();
}
else
// For now we do not need to check whether passed UUID is ID of agent's friend.
// Use common check of Voice Client state.
{
// don't need to check online/offline status because "usual resident" (resident that is not a friend)
// can be only ONLINE. There is no way to see "usual resident" in OFFLINE status. If we see "usual

7
indra/newview/llexpandabletextbox.cpp
View File

@ -322,6 +322,13 @@ void LLExpandableTextBox::expandTextBox()
// hide "more" link, and show full text contents
mTextBox->hideExpandText();
// *HACK dz
// hideExpandText brakes text styles (replaces hyper-links with plain text), see ticket EXT-3290
// Set text again to make text box re-apply styles.
// *TODO Find proper solution to fix this issue.
// Maybe add removeSegment to LLTextBase
mTextBox->setTextBase(mText);
S32 text_delta = mTextBox->getVerticalTextDelta();
text_delta += mTextBox->getVPad() * 2;
text_delta += mScroll->getBorderWidth() * 2;

1
indra/newview/llexpandabletextbox.h
View File

@ -61,6 +61,7 @@ protected:
// adds or removes "More" link as needed
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
/*virtual*/ void setText(const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params());
void setTextBase(const std::string& text) { LLTextBase::setText(text); }
/**
* Returns difference between text box height and text height.

12
indra/newview/skins/default/xui/en/panel_bottomtray.xml
View File

@ -351,9 +351,9 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
height="23"
image_overlay="Unread_IM"
image_overlay_alignment="center"
image_pressed="WellButton_Lit_Selected"
image_pressed_selected="WellButton_Lit"
image_selected="WellButton_Lit"
image_pressed="WellButton_Lit"
image_pressed_selected="WellButton_Lit_Selected"
image_selected="PushButton_Selected_Press"
label_color="Black"
left="0"
max_displayed_count="99"
@ -391,9 +391,9 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
width="35">
<button
bottom_pad="3"
image_selected="WellButton_Lit"
image_pressed="WellButton_Lit_Selected"
image_pressed_selected="WellButton_Lit "
image_pressed="WellButton_Lit"
image_pressed_selected="WellButton_Lit_Selected"
image_selected="PushButton_Selected_Press"
auto_resize="true"
halign="center"
height="23"