Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Idle timer tag update fix, by phr0z3nt04st

Browse Source
This commit is contained in:
Siana Gearz
2011-06-14 14:13:43 +02:00
parent 96a506a1d5
commit 42f60042eb
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llvoavatar.cpp
View File

@@ -3801,6 +3801,12 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
{
is_muted = LLMuteList::getInstance()->isMuted(getID());
}
//idle text
std::string idle_string;
if(!mIsSelf && mIdleTimer.getElapsedTimeF32() > 120 && gSavedSettings.getBOOL("AscentShowIdleTime"))
{
idle_string = getIdleTime();
}
if ((mNameString.empty() && !(mNameFromChatOverride && mNameFromChatText.empty())) ||
new_name ||
@@ -3809,7 +3815,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
(!title && !mTitle.empty()) ||
(title && mTitle != title->getString()) ||
(is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute) ||
is_appearance != mNameAppearance || client != mClientName ||
is_appearance != mNameAppearance || client != mClientName || idle_string != mIdleString ||
mNameFromAttachment != nameplate ||
mNameFromChatChanged)
{
@@ -3819,6 +3825,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
mNameBusy = is_busy;
mNameMute = is_muted;
mClientName = client;
mIdleString = idle_string;
mUsedNameSystem = phoenix_name_system;
mNameAppearance = is_appearance;
mTitle = title? title->getString() : "";
@@ -3949,10 +3956,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
line += "\n";
line += "(Editing Appearance)";
}
if(!isSelf() && mIdleTimer.getElapsedTimeF32() > 120 && gSavedSettings.getBOOL("AscentShowIdleTime"))
if(!mIdleString.empty())
{
line += "\n";
line += getIdleTime();
line += mIdleString;
}
mNameString = utf8str_to_wstring(line);

1
indra/newview/llvoavatar.h
View File

@@ -942,6 +942,7 @@ private:
bool mRenderGroupTitles;
std::string mRenderedName;
std::string mClientName;
std::string mIdleString;
S32 mUsedNameSystem;
//--------------------------------------------------------------------